Evolution Indicator

Merge lp:~kelemeng/evolution-indicator/bug437963 into lp:evolution-indicator

  1. bug437963
  2. Merge into trunk
Proposed by Gabor Kelemen
Status: Merged
Approved by: Neil J. Patel
Approved revision: 84
Merged at revision: 84
Proposed branch: lp:~kelemeng/evolution-indicator/bug437963
Merge into: lp:evolution-indicator
Diff against target: 57 lines (+12/-6)
3 files modified
po/POTFILES.in (+1/-0)
src/Makefile.am (+7/-3)
src/org-freedesktop-evolution-indicator.eplug.xml (+4/-3)
To merge this branch: bzr merge lp:~kelemeng/evolution-indicator/bug437963
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+67456@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/POTFILES.in'
2--- po/POTFILES.in 2009-02-16 20:47:52 +0000
3+++ po/POTFILES.in 2011-07-10 14:02:37 +0000
4@@ -1,2 +1,3 @@
5 data/evolution-indicator.schemas.in
6 src/evolution-indicator.c
7+src/org-freedesktop-evolution-indicator.eplug.xml
8
9=== modified file 'src/Makefile.am'
10--- src/Makefile.am 2010-03-01 12:06:20 +0000
11+++ src/Makefile.am 2011-07-10 14:02:37 +0000
12@@ -15,12 +15,16 @@
13 -module -avoid-version \
14 $(DEPS_LIBS)
15
16-org-freedesktop-evolution-indicator.eplug: org-freedesktop-evolution-indicator.eplug.in
17- sed -e 's|\@PLUGINDIR\@|$(plugindir)|' $< > $@
18+org-freedesktop-evolution-indicator.eplug.in : org-freedesktop-evolution-indicator.eplug.xml
19+ LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp/notthere $< $@
20+
21+org-freedesktop-evolution-indicator.eplug : org-freedesktop-evolution-indicator.eplug.in
22+ sed -e 's|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|' \
23+ -e 's|\@PLUGINDIR\@|$(plugindir)|' $< > $@
24
25 BUILT_SOURCES = $(plugin_DATA)
26
27 CLEANFILES = $(BUILT_SOURCES)
28
29 EXTRA_DIST = \
30- org-freedesktop-evolution-indicator.eplug.in
31+ org-freedesktop-evolution-indicator.eplug.xml
32
33=== renamed file 'src/org-freedesktop-evolution-indicator.eplug.in' => 'src/org-freedesktop-evolution-indicator.eplug.xml'
34--- src/org-freedesktop-evolution-indicator.eplug.in 2010-03-02 19:34:48 +0000
35+++ src/org-freedesktop-evolution-indicator.eplug.xml 2011-07-10 14:02:37 +0000
36@@ -4,9 +4,10 @@
37 type="shlib"
38 location="@PLUGINDIR@/liborg-freedesktop-evolution-indicator.so"
39 id="org.freedesktop.evolution_indicator"
40- name="Evolution Indicator">
41+ domain="@GETTEXT_PACKAGE@"
42+ _name="Evolution Indicator">
43
44- <description>Shows new mail count in a message indicator.</description>
45+ <_description>Shows new mail count in a message indicator.</_description>
46 <author name="Neil Jagdish Patel" email="neil.patel@canonical.com"/>
47
48 <hook class="org.gnome.evolution.mail.events:1.0">
49@@ -19,7 +20,7 @@
50
51 <hook class="org.gnome.evolution.mail.config:1.0">
52 <group target="prefs" id="org.gnome.evolution.mail.prefs">
53- <item type="section_table" path="00.general/30.options" label="When New Mail Arrives"></item>
54+ <item type="section_table" path="00.general/30.options" _label="When New Mail Arrives"></item>
55 <item type="item_table" path="00.general/40.options" factory="org_gnome_get_prefs"/>
56 </group>
57 </hook>

Subscribers

People subscribed via source and target branches