Merge lp:~rodrigo-moya/ubuntu/natty/gnome-applets/no-more-deprecated into lp:~ubuntu-desktop/gnome-applets/ubuntu

[Rodrigo Moya]

[Sebastien Bacher (seb128)]

Setting to Needs Fixing for now, as discussed on IRC the invest applet needs fixing before landing the update

review: Needs Fixing

[lp:~rodrigo-moya/ubuntu/natty/gnome-applets/no-more-deprecated]

59. By Rodrigo Moya on 2010-11-24

Some more invest applet fixes

60. By Rodrigo Moya on 2010-11-26

Add bug numbers

61. By Rodrigo Moya on 2010-11-29

New upstream release

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-25 23:24:33 +0000
+++ debian/changelog	2010-11-29 16:14:03 +0000
@@ -1,3 +1,18 @@
+gnome-applets (2.32.1.1-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/control*:
+    - Don't build-depend on deprecated python-gnome bindings
+    - Depend on introspection packages
+  * debian/patches/01_no_more_deprecated.patch:
+    - Add patch to migrate null_applet to libpanel-applet-3 (LP: #673109)
+      and invest applet to use GObject introspection (LP: #673110)
+  * debian/patches/81_silent_applet_cleaning:
+  * debian/patches/86_deprecate_battstatus.patch:
+  * debian/patches/87_deprecate_modemlights.patch:
+    - Rebased patches
+
+ -- Rodrigo Moya <[e-mail]>  Fri, 26 Nov 2010 19:10:27 +0100
+
 gnome-applets (2.32.1.1-0ubuntu1) natty; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2010-11-09 22:44:31 +0000
+++ debian/control	2010-11-29 16:14:03 +0000
@@ -18,7 +18,6 @@
                libglib2.0-dev (>= 2.22.0),
                libgconf2-dev (>= 2.8.0),
                scrollkeeper (>= 0.1.4) | rarian-compat,
-               libpanel-applet2-dev (>= 2.13.4),
                libpanel-applet-3-dev,
                libgtop2-dev (>= 2.11.92),
                libwnck-dev (>= 2.9.3),
@@ -26,9 +25,7 @@
                libnotify-dev (>= 0.3.2),
                libdbus-1-dev (>= 1.1.2),
                libdbus-glib-1-dev (>= 0.74),
-               python-gtk2-dev (>= 2.6),
                python-gobject-dev (>= 2.6),
-               python-gnome2-dev (>= 2.10),
                gnome-icon-theme (>= 2.15.91),
                libxml2-dev (>= 2.5.0),
                libgweather-dev (>= 2.22.1),
@@ -47,8 +44,7 @@
                network-manager-dev (>= 0.7),
                x11proto-kb-dev,
                gnome-pkg-tools (>= 0.10),
-               python-support (>= 0.4),
-               python-gnome2-desktop-dev
+               python-support (>= 0.4)
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-applets/ubuntu
 
 Package: gnome-applets-data
@@ -71,17 +67,17 @@
          gnome-panel (>= 2.32),
          gnome-icon-theme (>= 2.15.91),
          ${python:Depends},
-         gvfs
+         gvfs,
+         gir1.0-gtk-2.0,
+         gir1.0-gdkpixbuf-2.0,
+         gir1.0-gconf-2.0,
+         gir1.0-panelapplet-3.0
 Conflicts: trashapplet
 Replaces: trashapplet
 Provides: trashapplet
 Recommends: gnome-system-monitor,
             gnome-media,
-            python-gconf,
-            python-gnome2,
-            python-gnomeapplet,
             python-gobject,
-            python-gtk2,
             policykit-1-gnome
 Suggests: tomboy,
           gnome-netstatus-applet,

=== modified file 'debian/control.in'
--- debian/control.in	2010-11-09 22:44:31 +0000
+++ debian/control.in	2010-11-29 16:14:03 +0000
@@ -13,7 +13,6 @@
                libglib2.0-dev (>= 2.22.0),
                libgconf2-dev (>= 2.8.0),
                scrollkeeper (>= 0.1.4) | rarian-compat,
-               libpanel-applet2-dev (>= 2.13.4),
                libpanel-applet-3-dev,
                libgtop2-dev (>= 2.11.92),
                libwnck-dev (>= 2.9.3),
@@ -21,9 +20,7 @@
                libnotify-dev (>= 0.3.2),
                libdbus-1-dev (>= 1.1.2),
                libdbus-glib-1-dev (>= 0.74),
-               python-gtk2-dev (>= 2.6),
                python-gobject-dev (>= 2.6),
-               python-gnome2-dev (>= 2.10),
                gnome-icon-theme (>= 2.15.91),
                libxml2-dev (>= 2.5.0),
                libgweather-dev (>= 2.22.1),
@@ -42,8 +39,7 @@
                network-manager-dev (>= 0.7),
                x11proto-kb-dev,
                gnome-pkg-tools (>= 0.10),
-               python-support (>= 0.4),
-               python-gnome2-desktop-dev
+               python-support (>= 0.4)
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-applets/ubuntu
 
 Package: gnome-applets-data
@@ -66,17 +62,17 @@
          gnome-panel (>= 2.32),
          gnome-icon-theme (>= 2.15.91),
          ${python:Depends},
-         gvfs
+         gvfs,
+         gir1.0-gtk-2.0,
+         gir1.0-gdkpixbuf-2.0,
+         gir1.0-gconf-2.0,
+         gir1.0-panelapplet-3.0
 Conflicts: trashapplet
 Replaces: trashapplet
 Provides: trashapplet
 Recommends: gnome-system-monitor,
             gnome-media,
-            python-gconf,
-            python-gnome2,
-            python-gnomeapplet,
             python-gobject,
-            python-gtk2,
             policykit-1-gnome
 Suggests: tomboy,
           gnome-netstatus-applet,

=== added file 'debian/patches/01_no_more_deprecated.patch'
--- debian/patches/01_no_more_deprecated.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01_no_more_deprecated.patch	2010-11-29 16:14:03 +0000
@@ -0,0 +1,915 @@
+diff --git a/configure.in b/configure.in
+index 1779cd0..eca3982 100644
+--- a/configure.in
++++ b/configure.in
+@@ -16,7 +16,6 @@ GLIB_REQUIRED=2.22.0
+ GIO_REQUIRED=2.15.3
+ GCONF_REQUIRED=2.8.0
+ SCROLLKEEPER_REQUIRED=0.1.4
+-LIBPANEL_REQUIRED=2.13.4
+ LIBPANEL3_REQUIRED=2.31.2
+ LIBGTOP_REQUIRED=2.11.92
+ LIBXKLAVIER_REQUIRED=4.0
+@@ -26,9 +25,7 @@ LIBNOTIFY_REQUIRED=0.3.2
+ HAL_REQUIRED=0.5.3
+ DBUS_REQUIRED=1.1.2
+ DBUS_GLIB_REQUIRED=0.74
+-PYGTK_REQUIRED=2.6
+-PYGOBJECT_REQUIRED=2.6
+-GNOME_PYTHON_REQUIRED=2.10
++PYGOBJECT_REQUIRED=2.26
+ GNOME_ICON_THEME_REQUIRED=2.15.91
+ LIBXML_REQUIRED=2.5.0
+ GWEATHER_REQUIRED=2.22.1
+@@ -116,11 +113,6 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
+ AC_SUBST(GTK_FLAGS)
+ AC_SUBST(GTK_LIBS)
+ 
+-dnl -- check for libpanelapplet (required) ------------------------------------
+-PKG_CHECK_MODULES(GNOME_APPLETS, libpanelapplet-2.0 >= $LIBPANEL_REQUIRED)
+-AC_SUBST(GNOME_APPLETS_CFLAGS)
+-AC_SUBST(GNOME_APPLETS_LIBS)
+-
+ dnl -- check for libpanelapplet3 (required) ------------------------------------
+ PKG_CHECK_MODULES(GNOME_APPLETS3, libpanelapplet-3.0 >= $LIBPANEL3_REQUIRED)
+ AC_SUBST(GNOME_APPLETS3_CFLAGS)
+@@ -254,9 +246,7 @@ dnl -- check for Python/GNOME modules (optional) ------------------------------
+ PYGTK_CFLAGS=
+ PYGTK_LIBS=
+ PKG_CHECK_MODULES(PYGTK,
+-	pygtk-2.0	>= $PYGTK_REQUIRED
+-	pygobject-2.0	>= $PYGOBJECT_REQUIRED
+-	gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED,
++	pygobject-2.0	>= $PYGOBJECT_REQUIRED,
+ 	HAVE_PYGTK="yes", HAVE_PYGTK="no")
+ AC_SUBST(PYGTK_LIBS)
+ AC_SUBST(PYGTK_CFLAGS)
+@@ -559,14 +549,7 @@ dnl ***************************************************************************
+ dnl *** invest-applet specific checks                                       ***
+ dnl ***************************************************************************
+ 
+-if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then
+-	AM_CHECK_PYMOD(gnomeapplet,,
+-			BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no")
+-else
+-	BUILD_INVEST_APPLET="no"
+-fi
+-
+-AM_CONDITIONAL(BUILD_INVEST_APPLET, test "x$BUILD_INVEST_APPLET" = "xyes")
++AM_CONDITIONAL(BUILD_INVEST_APPLET, test "x$HAVE_PYGTK" = "xyes")
+ 
+ dnl ***************************************************************************
+ dnl *** Check if IPv6 is available                                          ***
+diff --git a/invest-applet/invest/__init__.py b/invest-applet/invest/__init__.py
+index 29fb7d6..ec53bcb 100644
+--- a/invest-applet/invest/__init__.py
++++ b/invest-applet/invest/__init__.py
+@@ -3,7 +3,7 @@ from os.path import join, exists, isdir, isfile, dirname, abspath, expanduser
+ from types import ListType
+ import datetime
+ 
+-import gtk, gtk.gdk, gconf, gobject
++from gi.repository import Gtk, Gdk, GConf, GObject
+ import cPickle
+ 
+ import networkmanager
+@@ -55,7 +55,7 @@ if not exists(USER_INVEST_DIR):
+ os.chdir(expanduser("~"))
+ 
+ #Gconf client
+-GCONF_CLIENT = gconf.client_get_default()
++GCONF_CLIENT = GConf.Client.get_default()
+ 
+ # GConf directory for invest in window mode and shared settings
+ GCONF_DIR = "/apps/invest"
+@@ -205,7 +205,7 @@ def get_gnome_proxy_retry(client, attempts, sleep):
+ 			gobject.timeout_add(sleep * 1000, get_gnome_proxy_retry, client, attempts, sleep)
+ 
+ # use gconf to get proxy config
+-client = gconf.client_get_default()
++client = GConf.Client.get_default()
+ get_gnome_proxy(client)
+ 
+ 
+diff --git a/invest-applet/invest/about.py b/invest-applet/invest/about.py
+index e2829e8..f228ae1 100644
+--- a/invest-applet/invest/about.py
++++ b/invest-applet/invest/about.py
+@@ -3,16 +3,16 @@ from os.path import join
+ from gettext import gettext as _
+ from invest.defs import VERSION
+ import invest
+-import gtk, gtk.gdk
++from gi.repository import Gtk, GdkPixbuf
+ 
+ invest_logo = None
+ try:
+-	invest_logo = gtk.gdk.pixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest_neutral.svg"), 96, 96)
++	invest_logo = GdkPixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest_neutral.svg"), 96, 96)
+ except Exception, msg:
+ 	pass
+ 	
+ def show_about():
+-	about = gtk.AboutDialog()
++	about = Gtk.AboutDialog()
+ 	infos = {
+ 		"program-name" : _("Invest"),
+ 		"logo" : invest_logo,
+diff --git a/invest-applet/invest/applet.py b/invest-applet/invest/applet.py
+index 4cd5ad7..a0236f2 100644
+--- a/invest-applet/invest/applet.py
++++ b/invest-applet/invest/applet.py
+@@ -1,17 +1,16 @@
+ import os, time
+ from os.path import *
+-import gnomeapplet, gtk, gtk.gdk, gconf, gobject
+-gobject.threads_init()
++from gi.repository import Gdk, GdkPixbuf, Gtk, PanelApplet, GObject, GConf
++GObject.threads_init()
+ from gettext import gettext as _
+-import gconf
+ 
+ import invest, invest.about, invest.chart, invest.preferences, invest.defs
+ from invest.quotes import QuoteUpdater
+ from invest.widgets import *
+ 
+-gtk.window_set_default_icon_from_file(join(invest.ART_DATA_DIR, "invest_neutral.svg"))
++Gtk.Window.set_default_icon_from_file(join(invest.ART_DATA_DIR, "invest_neutral.svg"))
+ 
+-class InvestApplet:
++class InvestApplet(PanelApplet.Applet):
+ 	def __init__(self, applet):
+ 		self.applet = applet
+ 		self.applet.setup_menu_from_file (
+@@ -22,8 +21,8 @@ class InvestApplet:
+ 					("Refresh", self.on_refresh)
+ 					])
+ 
+-		evbox = gtk.HBox()
+-		self.applet_icon = gtk.Image()
++		evbox = Gtk.HBox()
++		self.applet_icon = Gtk.Image()
+ 		self.set_applet_icon(0)
+ 		self.applet_icon.show()
+ 		evbox.add(self.applet_icon)
+@@ -43,7 +42,7 @@ class InvestApplet:
+ 		self.new_ilw()
+ 
+ 	def button_clicked(self, widget,event):
+-		if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1:
++		if event.type == Gdk.BUTTON_PRESS and event.button == 1:
+ 			# Three cases...
+ 			if len (invest.STOCKS) == 0:
+ 				# a) We aren't configured yet
+@@ -51,7 +50,7 @@ class InvestApplet:
+ 				self.reload_ilw()
+ 			elif not self.quotes_updater.quotes_valid:
+ 				# b) We can't get the data (e.g. offline)
+-				alert = gtk.MessageDialog(buttons=gtk.BUTTONS_CLOSE)
++				alert = Gtk.MessageDialog(buttons=gtk.BUTTONS_CLOSE)
+ 				alert.set_markup(_("<b>No stock quotes are currently available</b>"))
+ 				alert.format_secondary_text(_("The server could not be contacted. The computer is either offline or the servers are down. Try again later."))
+ 				alert.run()
+@@ -75,19 +74,19 @@ class InvestApplet:
+ 
+ 	def set_applet_icon(self, change):
+ 		if change == 1:
+-			pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest-22_up.png"), -1,-1)
++			pixbuf = GdkPixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest-22_up.png"), -1,-1)
+ 		elif change == 0:
+-			pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest-22_neutral.png"), -1,-1)
++			pixbuf = GdkPixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest-22_neutral.png"), -1,-1)
+ 		else:
+-			pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest-22_down.png"), -1,-1)
++			pixbuf = GdkPixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest-22_down.png"), -1,-1)
+ 		self.applet_icon.set_from_pixbuf(pixbuf)
+ 	
+ 	def set_applet_tooltip(self, text):
+ 		self.applet_icon.set_tooltip_text(text)
+ 
+-class InvestmentsListWindow(gtk.Window):
++class InvestmentsListWindow(Gtk.Window):
+ 	def __init__(self, applet, list):
+-		gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
++		Gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
+ 		self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DOCK)
+ 		self.stick()
+ 		self.set_resizable(False)
+@@ -128,58 +127,58 @@ class InvestmentsListWindow(gtk.Window):
+ 		screen = self.applet.window.get_screen()
+ 		monitor = screen.get_monitor_geometry (screen.get_monitor_at_window (self.applet.window))
+ 
+-		if self.alignment == gnomeapplet.ORIENT_LEFT:
+-				x = ax - ww
+-				y = ay
++		if self.alignment == PanelApplet.ORIENT_LEFT:
++			x = ax - ww
++			y = ay
+ 
+-				if (y + wh > monitor.y + monitor.height):
+-					y = monitor.y + monitor.height - wh
++			if (y + wh > monitor.y + monitor.height):
++				y = monitor.y + monitor.height - wh
+ 
+-				if (y < 0):
+-					y = 0
++			if (y < 0):
++				y = 0
+ 				
+-				if (y + wh > monitor.height / 2):
+-					gravity = gtk.gdk.GRAVITY_SOUTH_WEST
+-				else:
+-					gravity = gtk.gdk.GRAVITY_NORTH_WEST
++			if (y + wh > monitor.height / 2):
++				gravity = gtk.gdk.GRAVITY_SOUTH_WEST
++			else:
++				gravity = gtk.gdk.GRAVITY_NORTH_WEST
+ 					
+ 		elif self.alignment == gnomeapplet.ORIENT_RIGHT:
+-				x = ax + aw
+-				y = ay
++			x = ax + aw
++			y = ay
+ 
+-				if (y + wh > monitor.y + monitor.height):
+-					y = monitor.y + monitor.height - wh
++			if (y + wh > monitor.y + monitor.height):
++				y = monitor.y + monitor.height - wh
+ 				
+-				if (y < 0):
+-					y = 0
++			if (y < 0):
++				y = 0
+ 				
+-				if (y + wh > monitor.height / 2):
+-					gravity = gtk.gdk.GRAVITY_SOUTH_EAST
+-				else:
+-					gravity = gtk.gdk.GRAVITY_NORTH_EAST
++			if (y + wh > monitor.height / 2):
++				gravity = gtk.gdk.GRAVITY_SOUTH_EAST
++			else:
++				gravity = gtk.gdk.GRAVITY_NORTH_EAST
+ 
+ 		elif self.alignment == gnomeapplet.ORIENT_DOWN:
+-				x = ax
+-				y = ay + ah
++			x = ax
++			y = ay + ah
+ 
+-				if (x + ww > monitor.x + monitor.width):
+-					x = monitor.x + monitor.width - ww
++			if (x + ww > monitor.x + monitor.width):
++				x = monitor.x + monitor.width - ww
+ 
+-				if (x < 0):
+-					x = 0
++			if (x < 0):
++				x = 0
+ 
+-				gravity = gtk.gdk.GRAVITY_NORTH_WEST
++			gravity = gtk.gdk.GRAVITY_NORTH_WEST
+ 		elif self.alignment == gnomeapplet.ORIENT_UP:
+-				x = ax
+-				y = ay - wh
++			x = ax
++			y = ay - wh
+ 
+-				if (x + ww > monitor.x + monitor.width):
+-					x = monitor.x + monitor.width - ww
++			if (x + ww > monitor.x + monitor.width):
++				x = monitor.x + monitor.width - ww
+ 
+-				if (x < 0):
+-					x = 0
++			if (x < 0):
++				x = 0
+ 
+-				gravity = gtk.gdk.GRAVITY_SOUTH_WEST
++			gravity = gtk.gdk.GRAVITY_SOUTH_WEST
+ 
+ 		self.move(x, y)
+ 		self.set_gravity(gravity)
+diff --git a/invest-applet/invest/chart.py b/invest-applet/invest/chart.py
+index c6caff7..3e226e0 100644
+--- a/invest-applet/invest/chart.py
++++ b/invest-applet/invest/chart.py
+@@ -1,7 +1,6 @@
+ #!/usr/bin/env python
+ 
+-import gtk, gtk.gdk
+-import gobject
++from gi.repository import Gtk, GdkPixbuf, GObject
+ import os
+ import invest
+ from gettext import gettext as _
+@@ -15,16 +14,16 @@ import time
+ AUTOREFRESH_TIMEOUT = 20*60*1000 # 15 minutes
+ 
+ # based on http://www.johnstowers.co.nz/blog/index.php/2007/03/12/threading-and-pygtk/
+-class _IdleObject(gobject.GObject):
++class _IdleObject(GObject.GObject):
+ 	"""
+ 	Override gobject.GObject to always emit signals in the main thread
+ 	by emmitting on an idle handler
+ 	"""
+ 	def __init__(self):
+-		gobject.GObject.__init__(self)
++		GObject.GObject.__init__(self)
+ 
+ 	def emit(self, *args):
+-		gobject.idle_add(gobject.GObject.emit,self,*args)
++		GObject.idle_add(gobject.GObject.emit,self,*args)
+ 
+ class ImageRetriever(Thread, _IdleObject):
+ 	"""
+@@ -33,7 +32,7 @@ class ImageRetriever(Thread, _IdleObject):
+ 	"""
+ 	__gsignals__ =  { 
+ 			"completed": (
+-				gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, []),
++				GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, []),
+ 			# FIXME: should we be making use of this?
+ 			#"progress": (
+ 			#	gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [
+@@ -47,12 +46,12 @@ class ImageRetriever(Thread, _IdleObject):
+ 		self.retrieved = False
+ 		
+ 	def run(self):
+-		self.image = gtk.Image()
++		self.image = Gtk.Image()
+ 		try: sock = urllib.urlopen(self.image_url, proxies = invest.PROXY)
+ 		except Exception, msg:
+ 			invest.debug("Error while opening %s: %s" % (self.image_url, msg))
+ 		else:
+-			loader = gtk.gdk.PixbufLoader()
++			loader = GdkPixbuf.PixbufLoader()
+ 			loader.connect("closed", lambda loader: self.image.set_from_pixbuf(loader.get_pixbuf()))
+ 			loader.write(sock.read())
+ 			sock.close()
+@@ -107,7 +106,7 @@ class FinancialChart:
+ 		win.set_title(_("Financial Chart"))
+ 		
+ 		try:
+-			pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest_neutral.svg"), 96,96)
++			pixbuf = GdkPixbuf.pixbuf_new_from_file_at_size(join(invest.ART_DATA_DIR, "invest_neutral.svg"), 96,96)
+ 			self.ui.get_object("plot").set_from_pixbuf(pixbuf)
+ 		except Exception, msg:
+ 			invest.debug("Could not load 'invest-neutral.svg' file: %s" % msg)
+@@ -241,14 +240,14 @@ class FinancialChart:
+ 	
+ 	def on_autorefresh_toggled(self, autorefresh):
+ 		if self.autorefresh_id != 0:
+-			gobject.source_remove(self.autorefresh_id)
++			GObject.source_remove(self.autorefresh_id)
+ 			self.autorefresh_id = 0
+ 			
+ 		if autorefresh.get_active():
+-			self.autorefresh_id = gobject.timeout_add(AUTOREFRESH_TIMEOUT, self.on_refresh_chart, True)
++			self.autorefresh_id = GObject.timeout_add(AUTOREFRESH_TIMEOUT, self.on_refresh_chart, True)
+ 
+ def show_chart(tickers):
+-	ui = gtk.Builder();
++	ui = Gtk.Builder();
+ 	ui.add_from_file(os.path.join(invest.BUILDER_DATA_DIR, "financialchart.ui"))
+ 	chart = FinancialChart(ui)
+ 	ui.get_object("s").set_text(' '.join(tickers))
+diff --git a/invest-applet/invest/help.py b/invest-applet/invest/help.py
+index 7dfaabf..66399c5 100644
+--- a/invest-applet/invest/help.py
++++ b/invest-applet/invest/help.py
+@@ -1,8 +1,8 @@
+ # -*- coding: utf-8 -*-
+-import gtk, gtk.gdk
++from gi.repository import Gdk, Gtk
+ 
+ def show_help():
+-	gtk.show_uri(None, "ghelp:invest-applet", gtk.gdk.CURRENT_TIME)
++	Gtk.show_uri(None, "ghelp:invest-applet", Gdk.CURRENT_TIME)
+ 
+ def show_help_section(id):
+-	gtk.show_uri(None, "ghelp:invest-applet?%s" % id, gtk.gdk.CURRENT_TIME)
++	Gtk.show_uri(None, "ghelp:invest-applet?%s" % id, Gdk.CURRENT_TIME)
+diff --git a/invest-applet/invest/invest-applet.py b/invest-applet/invest/invest-applet.py
+index da1fb05..fd7b334 100755
+--- a/invest-applet/invest/invest-applet.py
++++ b/invest-applet/invest/invest-applet.py
+@@ -1,8 +1,8 @@
+ #!/usr/bin/env python
+ #
+ 
+-import gobject
+-import gtk, gnomeapplet
++from gi.repository import GObject, Gtk, PanelApplet
++from invest.applet import InvestApplet
+ 
+ import getopt, sys
+ from os.path import *
+@@ -37,12 +37,12 @@ def applet_factory(applet, iid):
+ 
+ # Return a standalone window that holds the applet
+ def build_window():
+-	app = gtk.Window(gtk.WINDOW_TOPLEVEL)
++	app = Gtk.Window(Gtk.WindowType.toplevel)
+ 	app.set_title(_("Invest Applet"))
+ 	app.connect("destroy", gtk.main_quit)
+ 	app.set_property('resizable', False)
+ 
+-	applet = gnomeapplet.Applet()
++	applet = PanelApplet.Applet()
+ 	applet_factory(applet, None)
+ 	applet.reparent(app)
+ 
+@@ -68,7 +68,7 @@ if __name__ == "__main__":
+ 	try:
+ 		opts, args = getopt.getopt(sys.argv[1:], "hdw", ["help", "debug", "window"])
+ 	except getopt.GetoptError:
+-		# Unknown args were passed, we fallback to bahave as if
++		# Unknown args were passed, we fallback to behave as if
+ 		# no options were passed
+ 		opts = []
+ 		args = sys.argv[1:]
+@@ -88,11 +88,11 @@ if __name__ == "__main__":
+ 
+ 	if standalone:
+ 		build_window()
+-		gtk.main()
++		Gtk.main()
+ 	else:
+-		gnomeapplet.bonobo_factory(
+-			"OAFIID:Invest_Applet_Factory",
+-			gnomeapplet.Applet.__gtype__,
+-			invest.defs.PACKAGE,
+-			invest.defs.VERSION,
+-			applet_factory)
++		PanelApplet.Applet.factory_main(
++			"InvestAppletFactory",
++			True,
++			InvestApplet.__gtype__,
++			applet_factory,
++			None)
+diff --git a/invest-applet/invest/preferences.py b/invest-applet/invest/preferences.py
+index 2485e16..018a630 100644
+--- a/invest-applet/invest/preferences.py
++++ b/invest-applet/invest/preferences.py
+@@ -1,14 +1,14 @@
+ from gettext import gettext as _
+ import locale
+ from os.path import join
+-import gtk, gobject, gconf
++from gi.repository import Gtk, GObject, GConf
+ import invest
+ import currencies
+ import cPickle
+ 
+ class PrefsDialog:
+ 	def __init__(self, applet):
+-		self.ui = gtk.Builder()
++		self.ui = Gtk.Builder()
+ 		self.ui.add_from_file(join(invest.BUILDER_DATA_DIR, "prefs-dialog.ui"))
+ 
+ 		self.dialog = self.ui.get_object("preferences")
+@@ -29,14 +29,14 @@ class PrefsDialog:
+ 
+ 		self.typs = (str, str, float, float, float, float)
+ 		self.names = (_("Symbol"), _("Label"), _("Amount"), _("Price"), _("Commission"), _("Currency Rate"))
+-		store = gtk.ListStore(*self.typs)
++		store = Gtk.ListStore(*self.typs)
+ 		store.set_sort_column_id(0, gtk.SORT_ASCENDING)
+ 		self.treeview.set_model(store)
+ 		self.model = store
+ 
+-		completion = gtk.EntryCompletion()
++		completion = Gtk.EntryCompletion()
+ 		self.currency.set_completion(completion)
+-		liststore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
++		liststore = Gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
+ 		completion.set_model(liststore)
+ 		completion.set_text_column(0)
+ 		for code, label in self.currencies.items():
+@@ -107,12 +107,12 @@ class PrefsDialog:
+ 		return len(text) - text.find(".") - 1
+ 
+ 	def create_cell (self, view, column, name, typ):
+-		cell_description = gtk.CellRendererText ()
++		cell_description = Gtk.CellRendererText ()
+ 		if typ == float:
+ 			cell_description.set_property("xalign", 1.0)
+ 		cell_description.set_property("editable", True)
+ 		cell_description.connect("edited", self.on_cell_edited, column, typ)
+-		column_description = gtk.TreeViewColumn (name, cell_description)
++		column_description = Gtk.TreeViewColumn (name, cell_description)
+ 		if typ == str:
+ 			column_description.set_attributes (cell_description, text=column)
+ 			column_description.set_sort_column_id(column)
+diff --git a/invest-applet/invest/quotes.py b/invest-applet/invest/quotes.py
+index b7ec21b..69472f3 100644
+--- a/invest-applet/invest/quotes.py
++++ b/invest-applet/invest/quotes.py
+@@ -1,5 +1,5 @@
+ from os.path import join
+-import gnomeapplet, gtk, gtk.gdk, gconf, gobject
++from gi.repository import PanelApplet, Gtk, Gdk, GConf, GObject
+ from gettext import gettext as _
+ import csv
+ import locale
+@@ -19,16 +19,16 @@ QUOTES_URL="http://finance.yahoo.com/d/quotes.csv?s=%(s)s&f=snc4l1d1t1c1ohgv&e=.
+ QUOTES_CSV_FIELDS=["ticker", "label", "currency", ("trade", float), "date", "time", ("variation", float), ("open", float), ("high", float), ("low", float), ("volume", int)]
+ 
+ # based on http://www.johnstowers.co.nz/blog/index.php/2007/03/12/threading-and-pygtk/
+-class _IdleObject(gobject.GObject):
++class _IdleObject(GObject.GObject):
+ 	"""
+ 	Override gobject.GObject to always emit signals in the main thread
+ 	by emmitting on an idle handler
+ 	"""
+ 	def __init__(self):
+-		gobject.GObject.__init__(self)
++		GObject.GObject.__init__(self)
+ 
+ 	def emit(self, *args):
+-		gobject.idle_add(gobject.GObject.emit,self,*args)
++		GObject.idle_add(gobject.GObject.emit,self,*args)
+ 
+ class QuotesRetriever(Thread, _IdleObject):
+ 	"""
+@@ -37,7 +37,7 @@ class QuotesRetriever(Thread, _IdleObject):
+ 	"""
+ 	__gsignals__ =  {
+ 			"completed": (
+-				gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, []),
++				GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, []),
+ 			# FIXME: We don't monitor progress, yet ...
+ 			#"progress": (
+ 			#	gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [
+@@ -65,14 +65,14 @@ class QuotesRetriever(Thread, _IdleObject):
+ 		self.emit("completed")
+ 
+ 
+-class QuoteUpdater(gtk.ListStore):
++class QuoteUpdater(Gtk.ListStore):
+ 	updated = False
+ 	last_updated = None
+ 	quotes_valid = False
+ 	timeout_id = None
+ 	SYMBOL, LABEL, CURRENCY, TICKER_ONLY, BALANCE, BALANCE_PCT, VALUE, VARIATION_PCT, PB = range(9)
+ 	def __init__ (self, change_icon_callback, set_tooltip_callback):
+-		gtk.ListStore.__init__ (self, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, bool, float, float, float, float, gtk.gdk.Pixbuf)
++		Gtk.ListStore.__init__ (self, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, bool, float, float, float, float, gtk.gdk.Pixbuf)
+ 		self.set_update_interval(AUTOREFRESH_TIMEOUT)
+ 		self.change_icon_callback = change_icon_callback
+ 		self.set_tooltip_callback = set_tooltip_callback
+@@ -85,11 +85,11 @@ class QuoteUpdater(gtk.ListStore):
+ 	def set_update_interval(self, interval):
+ 		if self.timeout_id != None:
+ 			invest.debug("Canceling refresh timer")
+-			gobject.source_remove(self.timeout_id)
++			GObject.source_remove(self.timeout_id)
+ 			self.timeout_id = None
+ 		if interval > 0:
+ 			invest.debug("Setting refresh timer to %s:%02d.%03d" % ( interval / 60000, interval % 60000 / 1000, interval % 1000) )
+-			self.timeout_id = gobject.timeout_add(interval, self.refresh)
++			self.timeout_id = GObject.timeout_add(interval, self.refresh)
+ 
+ 	def nm_state_changed(self):
+ 		# when nm is online but we do not have an update timer, create it and refresh
+@@ -406,6 +406,3 @@ class QuoteUpdater(gtk.ListStore):
+ 					res = False
+ 					break
+ 		return res
+-
+-if gtk.pygtk_version < (2,8,0):
+-	gobject.type_register(QuoteUpdater)
+diff --git a/invest-applet/invest/widgets.py b/invest-applet/invest/widgets.py
+index 13a2ec9..7c9bc91 100644
+--- a/invest-applet/invest/widgets.py
++++ b/invest-applet/invest/widgets.py
+@@ -1,6 +1,6 @@
+ import os, time
+ from os.path import *
+-import gnomeapplet, gtk, gtk.gdk, gconf, gobject, pango
++from gi.repository import PanelApplet, Gtk, Gdk, GConf, GObject, Pango
+ from gettext import gettext as _
+ import locale
+ import csv
+@@ -35,9 +35,9 @@ MEDIUM = -1
+ 
+ TICKER_TIMEOUT = 10000#3*60*1000#
+ 
+-class InvestWidget(gtk.TreeView):
++class InvestWidget(Gtk.TreeView):
+ 	def __init__(self, quotes_updater):
+-		gtk.TreeView.__init__(self)
++		Gtk.TreeView.__init__(self)
+ 		self.set_property("rules-hint", True)
+ 		self.set_reorderable(True)
+ 		self.set_hover_selection(True)
+@@ -54,10 +54,10 @@ class InvestWidget(gtk.TreeView):
+ 			self._getcelldata_balancepct]
+ 		for i, col_name in enumerate(col_names):
+ 			if i < 3:
+-				cell = gtk.CellRendererText()
++				cell = Gtk.CellRendererText()
+ 				if i > 0:
+ 					cell.set_property("xalign", 1.0)
+-				column = gtk.TreeViewColumn (col_name, cell)
++				column = Gtk.TreeViewColumn (col_name, cell)
+ 				if i == 0:
+ 					column.set_sort_column_id(quotes_updater.LABEL)
+ 				elif i == 2:
+@@ -65,15 +65,15 @@ class InvestWidget(gtk.TreeView):
+ 				column.set_cell_data_func(cell, col_cellgetdata_functions[i])
+ 				self.append_column(column)
+ 			elif i == 3:
+-				cell_pb = gtk.CellRendererPixbuf()
+-				column = gtk.TreeViewColumn (col_name, cell_pb, pixbuf=quotes_updater.PB)
++				cell_pb = Gtk.CellRendererPixbuf()
++				column = Gtk.TreeViewColumn (col_name, cell_pb, pixbuf=quotes_updater.PB)
+ 				self.append_column(column)
+ 			else:
+ 				# add the last two column only if we have any positions
+ 				if simple_quotes_only == False:
+-					cell = gtk.CellRendererText()
++					cell = Gtk.CellRendererText()
+ 					cell.set_property("xalign", 1.0)
+-					column = gtk.TreeViewColumn (col_name, cell)
++					column = Gtk.TreeViewColumn (col_name, cell)
+ 					if i == 4:
+ 						column.set_sort_column_id(quotes_updater.BALANCE)
+ 					elif i == 5:
+@@ -156,12 +156,12 @@ class InvestWidget(gtk.TreeView):
+ 
+ 		invest.chart.show_chart([ticker])
+ 
+-#class InvestTicker(gtk.Label):
++#class InvestTicker(Gtk.Label):
+ #	def __init__(self):
+-#		gtk.Label.__init__(self, _("Waiting..."))
++#		Gtk.Label.__init__(self, _("Waiting..."))
+ #
+ #		self.quotes = []
+-#		gobject.timeout_add(TICKER_TIMEOUT, self.scroll_quotes)
++#		GObject.timeout_add(TICKER_TIMEOUT, self.scroll_quotes)
+ #
+ #		get_quotes_updater().connect('quotes-updated', self.on_quotes_update)
+ #
+@@ -190,9 +190,9 @@ class InvestWidget(gtk.TreeView):
+ #
+ #gobject.type_register(InvestTicker)
+ 
+-class InvestTrend(gtk.Image):
++class InvestTrend(Gtk.Image):
+ 	def __init__(self):
+-		gtk.Image.__init__(self)
++		Gtk.Image.__init__(self)
+ 		self.pixbuf = None
+ 		self.previous_allocation = (0,0)
+ 		self.connect('size-allocate', self.on_size_allocate)
+@@ -202,14 +202,14 @@ class InvestTrend(gtk.Image):
+ 		if self.previous_allocation == (allocation.width, allocation.height):
+ 			return
+ 
+-		self.pixbuf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, allocation.height, allocation.height)
++		self.pixbuf = GdkPixbuf.Pixbuf(Gdk.COLORSPACE_RGB, True, 8, allocation.height, allocation.height)
+ 		self.set_color("grey")
+ 		self.previous_allocation = (allocation.width, allocation.height)
+ 
+ 	def set_color(self, color, opacity=0xFF):
+ 		if self.pixbuf != None:
+ 			try:
+-				color = pango.Color(color)
++				color = Pango.Color(color)
+ 				factor = float(0xFF)/0xFFFF
+ 				self.pixbuf.fill(
+ 					int(color.red*factor)<<24|int(color.green*factor)<<16|int(color.blue*factor)<<8|opacity)
+@@ -247,4 +247,4 @@ class InvestTrend(gtk.Image):
+ 
+ 		self.set_color(color, opacity)
+ 
+-gobject.type_register(InvestTrend)
++GObject.type_register(InvestTrend)
+diff --git a/null_applet/Makefile.am b/null_applet/Makefile.am
+index 2fe1d3e..b072b04 100644
+--- a/null_applet/Makefile.am
++++ b/null_applet/Makefile.am
+@@ -1,44 +1,40 @@
++applet_in_files = org.gnome.applets.NullApplet.panel-applet.in
++service_in_files = org.gnome.panel.applet.NullAppletFactory.service.in
++
+ INCLUDES = 			\
+ 	-I.			\
+ 	-I$(srcdir)		\
+-	$(GNOME_APPLETS_CFLAGS)
+-
+-## The null applet takes over if the mixer isn't built.
+-if !BUILD_MIXER_APPLET
+-mixer_server_in = GNOME_MixerApplet.server.in
+-endif
++	$(GNOME_APPLETS3_CFLAGS)
+ 
+ libexec_PROGRAMS = null_applet
+ 
+-null_applet_SOURCES = null_applet.c
++null_applet_SOURCES = null_applet.c null_applet.h
++
++null_applet_LDADD = $(GNOME_APPLETS3_LIBS)
++
++appletdir = $(datadir)/gnome-panel/applets
++applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
+ 
+-null_applet_LDADD = $(GNOME_APPLETS_LIBS)
++$(applet_in_files): $(applet_in_files).in Makefile
++	$(AM_V_GEN)sed \
++	    -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
++	    -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
++	    $< > $@
+ 
+-serverdir = $(libdir)/bonobo/servers
+-server_in_files =				\
+-	GNOME_NullApplet_Factory.server.in	\
+-	GNOME_CDPlayerApplet.server.in		\
+-	GNOME_MailcheckApplet_Factory.server.in	\
+-	GNOME_Panel_WirelessApplet.server.in	\
+-	GNOME_KeyboardApplet.server.in		\
+-	$(mixer_server_in)
+-server_DATA = $(server_in_files:.server.in=.server)
++%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+ 
+-@INTLTOOL_SERVER_RULE@
++servicedir   = $(datadir)/dbus-1/services
++service_DATA = $(service_in_files:.service.in=.service)
+ 
+-GNOME_NullApplet_Factory.server.in: GNOME_NullApplet_Factory.server.in.in
+-	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
++org.gnome.panel.applet.NullAppletFactory.service: $(service_in_files)
++	$(AM_V_GEN)sed \
++	    -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
++	    $< > $@
+ 
+-CLEANFILES = GNOME_NullApplet_Factory.server.in $(server_DATA)
++CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(schemas_DATA)
+ 
+-## Note that the mixer applet server.in file is always distributed, but
+-## note always used.
+-EXTRA_DIST =					\
+-	GNOME_NullApplet_Factory.server.in.in	\
+-	GNOME_CDPlayerApplet.server.in		\
+-	GNOME_MailcheckApplet_Factory.server.in	\
+-	GNOME_Panel_WirelessApplet.server.in	\
+-	GNOME_MixerApplet.server.in		\
+-	GNOME_KeyboardApplet.server.in
++EXTRA_DIST = \
++	$(service_in_files) \
++	org.gnome.applets.NullApplet.panel-applet.in.in
+ 
+ -include $(top_srcdir)/git.mk
+diff --git a/null_applet/null_applet.c b/null_applet/null_applet.c
+index b03521b..d6fb35d 100644
+--- a/null_applet/null_applet.c
++++ b/null_applet/null_applet.c
+@@ -24,11 +24,22 @@
+ #include <config.h>
+ #endif
+ 
++#include <glib/gi18n-lib.h>
+ #include <gtk/gtk.h>
+ #include <gconf/gconf-client.h>
+-#include <panel-applet.h>
++#include "null_applet.h"
+ 
+-static const char factory_iid[] = "OAFIID:GNOME_NullApplet_Factory";
++G_DEFINE_TYPE(NullApplet, null_applet, PANEL_TYPE_APPLET)
++
++static void
++null_applet_class_init (NullAppletClass *klass)
++{
++}
++
++static void
++null_applet_init (NullApplet *applet)
++{
++}
+ 
+ static inline void
+ insert_oafiids (GHashTable *hash_table)
+@@ -48,8 +59,6 @@ insert_oafiids (GHashTable *hash_table)
+ 			     "OAFIID:GNOME_KeyboardApplet", _("Keyboard Indicator"));
+ }
+ 
+-static gboolean already_running;
+-
+ static void
+ response_cb (GtkWidget *dialog, gint arg1, gpointer user_data)
+ {
+@@ -135,11 +144,8 @@ applet_factory (PanelApplet *applet,
+ 	char *applet_list;
+ 	GtkWidget *dialog;
+ 
+-	if (already_running)
+-	{
+-		return FALSE;
+-	}
+-	already_running = TRUE;
++	if (!g_str_equal (iid, "NullApplet"))
++	    return FALSE;
+ 
+ 	applet_list = get_all_applets ();
+ 
+@@ -167,7 +173,8 @@ applet_factory (PanelApplet *applet,
+ 	return TRUE;
+ }
+ 
+-PANEL_APPLET_BONOBO_FACTORY (factory_iid,
+-		PANEL_TYPE_APPLET,
+-		"Null-Applet", "0",
+-		applet_factory, NULL)
++PANEL_APPLET_OUT_PROCESS_FACTORY ("NullApplet",
++				  TYPE_NULL_APPLET,
++				  "null",
++				  applet_factory,
++				  NULL)
+diff --git a/null_applet/null_applet.h b/null_applet/null_applet.h
+new file mode 100644
+index 0000000..1c5f5bf
+--- /dev/null
++++ b/null_applet/null_applet.h
+@@ -0,0 +1,50 @@
++/* -*- mode: C; c-basic-offset: 4 -*-
++ * Null Applet - The Applet Deprecation Applet
++ * Copyright (c) 2004, Davyd Madeley
++ *
++ * This library 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 of the License, 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
++ *
++ * Author:
++ *   Rodrigo Moya <[e-mail]>
++ */
++
++#ifndef __NULL_APPLET_H
++#define __NULL_APPLET_H
++
++#include <panel-applet.h>
++
++G_BEGIN_DECLS
++
++#define TYPE_NULL_APPLET           (null_applet_get_type ())
++#define NULL_APPLET(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NULL_APPLET, NullApplet))
++#define NULL_APPLET_CLASS(obj)     (G_TYPE_CHECK_CLASS_CAST    ((obj), TYPE_NULL_APPLET, NullAppletClass))
++#define IS_NULL_APPLET(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NULL_APPLET))
++#define IS_NULL_APPLET_CLASS(obj)  (G_TYPE_CHECK_CLASS_TYPE    ((obj), TYPE_NULL_APPLET))
++#define NULL_APPLET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS  ((obj), TYPE_NULL_APPLET, NullAppletClass))
++
++typedef struct _NullApplet      NullApplet;
++typedef struct _NullAppletClass NullAppletClass;
++
++struct _NullApplet {
++  PanelApplet parent;
++};
++
++struct _NullAppletClass {
++  PanelAppletClass parent_class;
++};
++
++G_END_DECLS
++
++#endif
+diff --git a/null_applet/org.gnome.applets.NullApplet.panel-applet.in.in b/null_applet/org.gnome.applets.NullApplet.panel-applet.in.in
+new file mode 100644
+index 0000000..b349511
+--- /dev/null
++++ b/null_applet/org.gnome.applets.NullApplet.panel-applet.in.in
+@@ -0,0 +1,15 @@
++[Applet Factory]
++Id=NullAppletFactory
++Location=@LIBEXECDIR@/null_applet
++_Name=Null Applet Factory
++_Description=Null Applet Factory
++
++[NullApplet]
++_Name=Null applet
++_Description=Check for obsolete applets
++BonoboId=OAFIID:GNOME_MailcheckApplet;OAFIID:GNOME_CDPlayerApplet;OAFIID:GNOME_MixerApplet_Factory;OAFIID:GNOME_MixerApplet;OAFIID:GNOME_KeyboardApplet;OAFIID:GNOME_BattstatApplet;OAFIID:GNOME_ModemLightsApplet;
++X-GNOME-Bugzilla-Bugzilla=GNOME
++X-GNOME-Bugzilla-Product=gnome-applets
++X-GNOME-Bugzilla-Component=null
++X-GNOME-Bugzilla-Version=@VERSION@
++X-GNOME-Bugzilla-OtherBinaries=null_applet
+diff --git a/null_applet/org.gnome.panel.applet.NullAppletFactory.service.in b/null_applet/org.gnome.panel.applet.NullAppletFactory.service.in
+new file mode 100644
+index 0000000..49f8d40
+--- /dev/null
++++ b/null_applet/org.gnome.panel.applet.NullAppletFactory.service.in
+@@ -0,0 +1,3 @@
++[D-BUS Service]
++Name=org.gnome.panel.applet.NullAppletFactory
++Exec=@LIBEXECDIR@/null_applet

=== modified file 'debian/patches/81_silent_applet_cleaning'
--- debian/patches/81_silent_applet_cleaning	2010-07-13 04:27:53 +0000
+++ debian/patches/81_silent_applet_cleaning	2010-11-29 16:14:03 +0000
@@ -2,9 +2,9 @@
 ===================================================================
 --- gnome-applets-2.30.0.orig/null_applet/null_applet.c	2010-03-28 16:29:51.000000000 +1100
 +++ gnome-applets-2.30.0/null_applet/null_applet.c	2010-07-13 14:23:45.398124000 +1000
-@@ -50,11 +50,13 @@
+@@ -62,11 +62,13 @@
  
- static gboolean already_running;
+ }
  
 +/*
  static void
@@ -16,7 +16,7 @@
  
  static char
  *get_all_applets (void)
-@@ -133,16 +135,18 @@
+@@ -142,12 +145,14 @@
  		gpointer     user_data)
  {
  	char *applet_list;
@@ -24,11 +24,8 @@
  	GtkWidget *dialog;
 +	*/
  
- 	if (already_running)
- 	{
+ 	if (!g_str_equal (iid, "NullApplet"))
  		return FALSE;
- 	}
- 	already_running = TRUE;
 -
 +    
  	applet_list = get_all_applets ();
@@ -37,7 +34,7 @@
  	dialog = gtk_message_dialog_new_with_markup (NULL,
  			GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
  			GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
-@@ -156,13 +160,14 @@
+@@ -162,13 +166,14 @@
  			applet_list,
  			_("You will not receive this message again.")
  			);

=== modified file 'debian/patches/86_deprecate_battstatus.patch'
--- debian/patches/86_deprecate_battstatus.patch	2010-03-29 09:59:14 +0000
+++ debian/patches/86_deprecate_battstatus.patch	2010-11-29 16:14:03 +0000
@@ -1,69 +1,8 @@
-Index: gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in	2010-03-29 11:55:08.885546800 +0200
-@@ -0,0 +1,21 @@
-+<oaf_info>
-+
-+<oaf_server iid="OAFIID:GNOME_BattstatApplet"
-+	    type="factory"
-+	    location="OAFIID:GNOME_NullApplet_Factory">
-+
-+	<oaf_attribute name="repo_ids" type="stringv">
-+		<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
-+		<item value="IDL:Bonobo/Control:1.0"/>
-+		<item value="IDL:Bonobo/Unknown:1.0"/>
-+	</oaf_attribute>
-+	<oaf_attribute name="name" type="string" _value="Battery Charge Monitor (Deprecated)"/>
-+	<oaf_attribute name="description" type="string" _value="Monitor a laptop's remaining power"/>
-+	<oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
-+        <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
-+        <oaf_attribute name="bugzilla:component" type="string" value="battery"/>
-+        <oaf_attribute name="bugzilla:other_binaries" type="string" value="battstat-applet-2"/>
-+        
-+</oaf_server>
-+
-+</oaf_info>
-Index: gnome-applets-2.30.0/null_applet/Makefile.am
-===================================================================
---- gnome-applets-2.30.0.orig/null_applet/Makefile.am	2010-03-28 07:29:51.000000000 +0200
-+++ gnome-applets-2.30.0/null_applet/Makefile.am	2010-03-29 11:57:44.597546031 +0200
-@@ -8,6 +8,11 @@
- mixer_server_in = GNOME_MixerApplet.server.in
- endif
- 
-+## The null applet takes over if the battstat applet isn't built
-+if !BUILD_BATTSTAT_APPLET
-+battstat_server_in = GNOME_BattstatApplet.server.in
-+endif
-+
- libexec_PROGRAMS = null_applet
- 
- null_applet_SOURCES = null_applet.c
-@@ -21,7 +26,8 @@
- 	GNOME_MailcheckApplet_Factory.server.in	\
- 	GNOME_Panel_WirelessApplet.server.in	\
- 	GNOME_KeyboardApplet.server.in		\
--	$(mixer_server_in)
-+	$(mixer_server_in)                      \
-+        $(battstat_server_in)
- server_DATA = $(server_in_files:.server.in=.server)
- 
- @INTLTOOL_SERVER_RULE@
-@@ -39,6 +45,7 @@
- 	GNOME_MailcheckApplet_Factory.server.in	\
- 	GNOME_Panel_WirelessApplet.server.in	\
- 	GNOME_MixerApplet.server.in		\
--	GNOME_KeyboardApplet.server.in
-+	GNOME_KeyboardApplet.server.in          \
-+        GNOME_BattstatApplet.server.in
- 
- -include $(top_srcdir)/git.mk
 Index: gnome-applets-2.30.0/null_applet/null_applet.c
 ===================================================================
 --- gnome-applets-2.30.0.orig/null_applet/null_applet.c	2010-03-29 11:55:08.000000000 +0200
 +++ gnome-applets-2.30.0/null_applet/null_applet.c	2010-03-29 11:58:38.588546843 +0200
-@@ -46,6 +46,8 @@
+@@ -57,6 +57,8 @@
  			     "OAFIID:GNOME_MixerApplet", _("Volume Control"));
  	g_hash_table_insert (hash_table,
  			     "OAFIID:GNOME_KeyboardApplet", _("Keyboard Indicator"));
@@ -71,4 +10,4 @@
 +                             "OAFIID:GNOME_BattstatApplet", _("Battery Charge Monitor"));
  }
  
- static gboolean already_running;
+ static void

=== modified file 'debian/patches/87_deprecate_modemlights.patch'
--- debian/patches/87_deprecate_modemlights.patch	2010-03-29 10:01:09 +0000
+++ debian/patches/87_deprecate_modemlights.patch	2010-11-29 16:14:03 +0000
@@ -1,34 +1,8 @@
-Index: gnome-applets-2.30.0/null_applet/GNOME_ModemLights.server.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-applets-2.30.0/null_applet/GNOME_ModemLights.server.in	2010-03-29 12:00:10.201547164 +0200
-@@ -0,0 +1,21 @@
-+<oaf_info>
-+
-+<oaf_server iid="OAFIID:GNOME_ModemLightsApplet"
-+	    type="factory"
-+	    location="OAFIID:GNOME_NullApplet_Factory">
-+
-+	<oaf_attribute name="repo_ids" type="stringv">
-+		<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
-+		<item value="IDL:Bonobo/Control:1.0"/>
-+		<item value="IDL:Bonobo/Unknown:1.0"/>
-+	</oaf_attribute>
-+	<oaf_attribute name="name" type="string" _value="Modem Monitor (Deprecated)"/>
-+	<oaf_attribute name="description" type="string" _value="Activate and monitor a dial-up network connection"/>
-+	<oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
-+        <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
-+        <oaf_attribute name="bugzilla:component" type="string" value="modemlights"/>
-+        <oaf_attribute name="bugzilla:other_binaries" type="string" value="modem_applet"/>
-+        
-+</oaf_server>
-+
-+</oaf_info>
 Index: gnome-applets-2.30.0/null_applet/null_applet.c
 ===================================================================
 --- gnome-applets-2.30.0.orig/null_applet/null_applet.c	2010-03-29 11:59:59.000000000 +0200
 +++ gnome-applets-2.30.0/null_applet/null_applet.c	2010-03-29 12:00:46.173545772 +0200
-@@ -48,6 +48,8 @@
+@@ -59,6 +59,8 @@
  			     "OAFIID:GNOME_KeyboardApplet", _("Keyboard Indicator"));
          g_hash_table_insert (hash_table,
                               "OAFIID:GNOME_BattstatApplet", _("Battery Charge Monitor"));
@@ -36,24 +10,4 @@
 +                             "OAFIID:GNOME_ModemLightsApplet", _("Modem Monitor"));
  }
  
- static gboolean already_running;
-Index: gnome-applets-2.30.0/null_applet/Makefile.am
-===================================================================
---- gnome-applets-2.30.0.orig/null_applet/Makefile.am	2010-03-29 11:59:59.000000000 +0200
-+++ gnome-applets-2.30.0/null_applet/Makefile.am	2010-03-29 12:00:10.213548548 +0200
-@@ -24,6 +24,7 @@
- 	GNOME_NullApplet_Factory.server.in	\
- 	GNOME_CDPlayerApplet.server.in		\
- 	GNOME_MailcheckApplet_Factory.server.in	\
-+	GNOME_ModemLights.server.in	\
- 	GNOME_Panel_WirelessApplet.server.in	\
- 	GNOME_KeyboardApplet.server.in		\
- 	$(mixer_server_in)                      \
-@@ -43,6 +44,7 @@
- 	GNOME_NullApplet_Factory.server.in.in	\
- 	GNOME_CDPlayerApplet.server.in		\
- 	GNOME_MailcheckApplet_Factory.server.in	\
-+	GNOME_ModemLights.server.in	\
- 	GNOME_Panel_WirelessApplet.server.in	\
- 	GNOME_MixerApplet.server.in		\
- 	GNOME_KeyboardApplet.server.in          \
+ static void

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-09 22:10:19 +0000
+++ debian/patches/series	2010-11-29 16:14:03 +0000
@@ -1,6 +1,7 @@
+01_no_more_deprecated.patch
 15_path-max.patch
 80_correct_minicommander_install.patch
-81_silent_applet_cleaning
+#81_silent_applet_cleaning
 86_deprecate_battstatus.patch
 87_deprecate_modemlights.patch
 88_hide_deprecated_mixer.patch