Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Romain Perier (mrpouet)" <mrpouet@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-extra/indicator-applet/files: indicator-applet-0.3.6-fastuserswitchapplet-collision.patch
Date: Sun, 04 Apr 2010 10:32:37
Message-Id: E1NyN84-00019C-1O@stork.gentoo.org
1 mrpouet 10/04/04 10:32:32
2
3 Added:
4 indicator-applet-0.3.6-fastuserswitchapplet-collision.patch
5 Log:
6 Version bump.
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 gnome-extra/indicator-applet/files/indicator-applet-0.3.6-fastuserswitchapplet-collision.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/indicator-applet/files/indicator-applet-0.3.6-fastuserswitchapplet-collision.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/indicator-applet/files/indicator-applet-0.3.6-fastuserswitchapplet-collision.patch?rev=1.1&content-type=text/plain
14
15 Index: indicator-applet-0.3.6-fastuserswitchapplet-collision.patch
16 ===================================================================
17 From: Romain Perier <mrpouet@g.o>
18 Date: Sun, 4 Apr 2010 11:24:07 +0200
19 Subject: Do not collide with GNOME_FastUserSwicthApplet.server
20
21 This file is already installed by gdm, however it's also required by indicator-applet-session
22 (gdm-user-switch-applet-like but a little different) that's why I renamed it properly.
23
24 ---
25 data/GNOME_FastUserSwitchApplet.server.in.in | 28 ------------------------
26 data/GNOME_IndicatorAppletSession.server.in.in | 28 ++++++++++++++++++++++++
27 data/Makefile.am | 4 +-
28 src/applet-main.c | 2 +-
29 4 files changed, 31 insertions(+), 31 deletions(-)
30 delete mode 100644 data/GNOME_FastUserSwitchApplet.server.in.in
31 create mode 100644 data/GNOME_IndicatorAppletSession.server.in.in
32
33 --- a/data/GNOME_FastUserSwitchApplet.server.in.in
34 +++ /dev/null
35 @@ -1,28 +0,0 @@
36 -<oaf_info>
37 - <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet_Factory" type="exe"
38 - location="@LIBEXECDIR@/indicator-applet-session">
39 -
40 - <oaf_attribute name="repo_ids" type="stringv">
41 - <item value="IDL:Bonobo/GenericFactory:1.0"/>
42 - <item value="IDL:Bonobo/Unknown:1.0"/>
43 - </oaf_attribute>
44 - <oaf_attribute name="name" type="string" value="Indicator Applet Factory"/>
45 - <oaf_attribute name="description" type="string" value="Indicator Applet Factory"/>
46 - <oaf_attribute name="bonobo:environment" type="stringv">
47 - <item value="DBUS_SESSION_BUS_ADDRESS"/>
48 - </oaf_attribute>
49 - </oaf_server>
50 -
51 - <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet" type="factory"
52 - location="OAFIID:GNOME_FastUserSwitchApplet_Factory">
53 -
54 - <oaf_attribute name="repo_ids" type="stringv">
55 - <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
56 - <item value="IDL:Bonobo/Control:1.0"/>
57 - <item value="IDL:Bonobo/Unknown:1.0"/>
58 - </oaf_attribute>
59 - <oaf_attribute name="name" type="string" _value="Indicator Applet Session"/>
60 - <oaf_attribute name="description" type="string" _value="A place to adjust your status, change users or exit your session."/>
61 - <oaf_attribute name="panel:icon" type="string" value="indicator-applet"/>
62 - </oaf_server>
63 -</oaf_info>
64 --- /dev/null
65 +++ b/data/GNOME_IndicatorAppletSession.server.in.in
66 @@ -0,0 +1,28 @@
67 +<oaf_info>
68 + <oaf_server iid="OAFIID:GNOME_IndicatorAppletSession_Factory" type="exe"
69 + location="@LIBEXECDIR@/indicator-applet-session">
70 +
71 + <oaf_attribute name="repo_ids" type="stringv">
72 + <item value="IDL:Bonobo/GenericFactory:1.0"/>
73 + <item value="IDL:Bonobo/Unknown:1.0"/>
74 + </oaf_attribute>
75 + <oaf_attribute name="name" type="string" value="Indicator Applet Factory"/>
76 + <oaf_attribute name="description" type="string" value="Indicator Applet Factory"/>
77 + <oaf_attribute name="bonobo:environment" type="stringv">
78 + <item value="DBUS_SESSION_BUS_ADDRESS"/>
79 + </oaf_attribute>
80 + </oaf_server>
81 +
82 + <oaf_server iid="OAFIID:GNOME_IndicatorAppletSession" type="factory"
83 + location="OAFIID:GNOME_IndicatorAppletSession_Factory">
84 +
85 + <oaf_attribute name="repo_ids" type="stringv">
86 + <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
87 + <item value="IDL:Bonobo/Control:1.0"/>
88 + <item value="IDL:Bonobo/Unknown:1.0"/>
89 + </oaf_attribute>
90 + <oaf_attribute name="name" type="string" _value="Indicator Applet Session"/>
91 + <oaf_attribute name="description" type="string" _value="A place to adjust your status, change users or exit your session."/>
92 + <oaf_attribute name="panel:icon" type="string" value="indicator-applet"/>
93 + </oaf_server>
94 +</oaf_info>
95 --- a/data/Makefile.am
96 +++ b/data/Makefile.am
97 @@ -9,7 +9,7 @@ serverdir = \
98 server_in_files = \
99 GNOME_IndicatorApplet.server.in \
100 GNOME_IndicatorAppletComplete.server.in \
101 - GNOME_FastUserSwitchApplet.server.in
102 + GNOME_IndicatorAppletSession.server.in
103 server_DATA = \
104 $(server_in_files:.server.in=.server)
105
106 @@ -70,7 +70,7 @@ EXTRA_DIST = \
107 $(icons_DATA) \
108 GNOME_IndicatorApplet.server.in.in \
109 GNOME_IndicatorAppletComplete.server.in.in \
110 - GNOME_FastUserSwitchApplet.server.in.in \
111 + GNOME_IndicatorAppletSession.server.in.in \
112 $(schema_in_files)
113
114 MAINTAINERCLEANFILES = \
115 --- a/src/applet-main.c
116 +++ b/src/applet-main.c
117 @@ -63,7 +63,7 @@ PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_IndicatorApplet_Factory",
118 applet_fill_cb, NULL);
119 #endif
120 #ifdef INDICATOR_APPLET_SESSION
121 -PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FastUserSwitchApplet_Factory",
122 +PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_IndicatorAppletSession_Factory",
123 PANEL_TYPE_APPLET,
124 "indicator-applet-session", "0",
125 applet_fill_cb, NULL);
Report Message
Find on MARC Find on Google Groups