patches/gnome-applets-04-deprecate-now-applet.diff
author Jon Tibble <meths@btinternet.com>
Sat, 06 Oct 2012 16:11:50 +0100
branchs11express-2010-11
changeset 22109 db10202d5f6d
parent 17793 208207fdc93f
permissions -rw-r--r--
Added tag oi_151a_prestable7 for changeset 25dee50cecca
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
15101
c58f707cf6b7 * base-specs/gnome-applets.spec : Bump to 2.25.90
mattman
parents: 14991
diff changeset
     1
/jds/bin/diff -uprN gnome-applets-2.25.90.old/null_applet/GNOME_Panel_NowApplet.server.in gnome-applets-2.25.90/null_applet/GNOME_Panel_NowApplet.server.in
c58f707cf6b7 * base-specs/gnome-applets.spec : Bump to 2.25.90
mattman
parents: 14991
diff changeset
     2
--- gnome-applets-2.25.90.old/null_applet/GNOME_Panel_NowApplet.server.in	1970-01-01 01:00:00.000000000 +0100
c58f707cf6b7 * base-specs/gnome-applets.spec : Bump to 2.25.90
mattman
parents: 14991
diff changeset
     3
+++ gnome-applets-2.25.90/null_applet/GNOME_Panel_NowApplet.server.in	2009-02-16 17:39:36.003044000 +0000
9326
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
     4
@@ -0,0 +1,17 @@
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
     5
+<oaf_info>
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
     6
+
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
     7
+<oaf_server iid="OAFIID:GNOME_Panel_NowApplet"
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
     8
+	    type="factory" 
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
     9
+	    location="OAFIID:GNOME_NullApplet_Factory">
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    10
+
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    11
+	<oaf_attribute name="repo_ids" type="stringv">
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    12
+		<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    13
+		<item value="IDL:Bonobo/Control:1.0"/>
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    14
+		<item value="IDL:Bonobo/Unknown:1.0"/>
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    15
+	</oaf_attribute>
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    16
+	<oaf_attribute name="name" type="string" _value="Appointments and Tasks (Deprecated)"/>
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    17
+	<oaf_attribute name="description" type="string" _value="Sun Java System Calendar Server client applet"/>
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    18
+
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    19
+</oaf_server>
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    20
+
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    21
+</oaf_info>
17793
208207fdc93f 2010-04-03 Christian Kelly <[email protected]>
chrisk
parents: 16548
diff changeset
    22
diff -ruN gnome-applets-2.30.0.orig/null_applet/Makefile.am gnome-applets-2.30.0/null_applet/Makefile.am
208207fdc93f 2010-04-03 Christian Kelly <[email protected]>
chrisk
parents: 16548
diff changeset
    23
--- gnome-applets-2.30.0.orig/null_applet/Makefile.am	2010-04-03 23:25:29.967872915 +0100
208207fdc93f 2010-04-03 Christian Kelly <[email protected]>
chrisk
parents: 16548
diff changeset
    24
+++ gnome-applets-2.30.0/null_applet/Makefile.am	2010-04-03 23:26:23.731734212 +0100
16548
c2c2812b2009 2009-09-14 Dave Lin <[email protected]>
davelam
parents: 15101
diff changeset
    25
@@ -20,6 +20,7 @@
9326
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    26
 	GNOME_CDPlayerApplet.server.in		\
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    27
 	GNOME_MailcheckApplet_Factory.server.in	\
14991
651e5addb880 2009-01-30 Michal Pryc <[email protected]>
migi
parents: 9326
diff changeset
    28
 	GNOME_Panel_WirelessApplet.server.in	\
17793
208207fdc93f 2010-04-03 Christian Kelly <[email protected]>
chrisk
parents: 16548
diff changeset
    29
+	GNOME_Panel_NowApplet.server.in		\
208207fdc93f 2010-04-03 Christian Kelly <[email protected]>
chrisk
parents: 16548
diff changeset
    30
 	GNOME_KeyboardApplet.server.in		\
15101
c58f707cf6b7 * base-specs/gnome-applets.spec : Bump to 2.25.90
mattman
parents: 14991
diff changeset
    31
 	$(mixer_server_in)
9326
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    32
 server_DATA = $(server_in_files:.server.in=.server)
17793
208207fdc93f 2010-04-03 Christian Kelly <[email protected]>
chrisk
parents: 16548
diff changeset
    33
@@ -38,6 +39,7 @@
9326
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    34
 	GNOME_CDPlayerApplet.server.in		\
24367956a0f6 2007-02-18 Glynn Foster <[email protected]>
gman
parents:
diff changeset
    35
 	GNOME_MailcheckApplet_Factory.server.in	\
14991
651e5addb880 2009-01-30 Michal Pryc <[email protected]>
migi
parents: 9326
diff changeset
    36
 	GNOME_Panel_WirelessApplet.server.in	\
16548
c2c2812b2009 2009-09-14 Dave Lin <[email protected]>
davelam
parents: 15101
diff changeset
    37
+	GNOME_Panel_NowApplet.server.in		\
17793
208207fdc93f 2010-04-03 Christian Kelly <[email protected]>
chrisk
parents: 16548
diff changeset
    38
 	GNOME_MixerApplet.server.in		\
208207fdc93f 2010-04-03 Christian Kelly <[email protected]>
chrisk
parents: 16548
diff changeset
    39
 	GNOME_KeyboardApplet.server.in
16548
c2c2812b2009 2009-09-14 Dave Lin <[email protected]>
davelam
parents: 15101
diff changeset
    40