diff -p -up gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in.null-battstat gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in --- gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in.null-battstat 2010-03-28 17:54:07.000000000 +0200 +++ gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in 2010-03-28 17:54:07.000000000 +0200 @@ -0,0 +1,22 @@ +<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"/> + <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> diff -p -up gnome-applets-2.30.0/null_applet/Makefile.am.null-battstat gnome-applets-2.30.0/null_applet/Makefile.am --- gnome-applets-2.30.0/null_applet/Makefile.am.null-battstat 2010-03-28 07:29:51.000000000 +0200 +++ gnome-applets-2.30.0/null_applet/Makefile.am 2010-03-28 17:58:49.000000000 +0200 @@ -8,6 +8,10 @@ if !BUILD_MIXER_APPLET mixer_server_in = GNOME_MixerApplet.server.in endif +if !BUILD_BATTSTAT_APPLET +battstat_applet=GNOME_BattstatApplet.server.in +endif + libexec_PROGRAMS = null_applet null_applet_SOURCES = null_applet.c @@ -19,7 +23,7 @@ server_in_files = \ GNOME_NullApplet_Factory.server.in \ GNOME_CDPlayerApplet.server.in \ GNOME_MailcheckApplet_Factory.server.in \ - GNOME_Panel_WirelessApplet.server.in \ + $(battstat_applet) \ GNOME_KeyboardApplet.server.in \ $(mixer_server_in) server_DATA = $(server_in_files:.server.in=.server) diff -p -up gnome-applets-2.30.0/null_applet/null_applet.c.null-battstat gnome-applets-2.30.0/null_applet/null_applet.c --- gnome-applets-2.30.0/null_applet/null_applet.c.null-battstat 2010-03-28 07:29:51.000000000 +0200 +++ gnome-applets-2.30.0/null_applet/null_applet.c 2010-03-28 17:58:04.000000000 +0200 @@ -46,6 +46,8 @@ insert_oafiids (GHashTable *hash_table) "OAFIID:GNOME_MixerApplet", _("Volume Control")); g_hash_table_insert (hash_table, "OAFIID:GNOME_KeyboardApplet", _("Keyboard Indicator")); + g_hash_table_insert (hash_table, + "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor"); } static gboolean already_running;