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
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2009-02-16 20:47:52 +0000
+++ po/POTFILES.in 2011-07-10 14:02:37 +0000
@@ -1,2 +1,3 @@
1data/evolution-indicator.schemas.in1data/evolution-indicator.schemas.in
2src/evolution-indicator.c2src/evolution-indicator.c
3src/org-freedesktop-evolution-indicator.eplug.xml
34
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2010-03-01 12:06:20 +0000
+++ src/Makefile.am 2011-07-10 14:02:37 +0000
@@ -15,12 +15,16 @@
15 -module -avoid-version \15 -module -avoid-version \
16 $(DEPS_LIBS)16 $(DEPS_LIBS)
1717
18org-freedesktop-evolution-indicator.eplug: org-freedesktop-evolution-indicator.eplug.in18org-freedesktop-evolution-indicator.eplug.in : org-freedesktop-evolution-indicator.eplug.xml
19 sed -e 's|\@PLUGINDIR\@|$(plugindir)|' $< > $@19 LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp/notthere $< $@
20
21org-freedesktop-evolution-indicator.eplug : org-freedesktop-evolution-indicator.eplug.in
22 sed -e 's|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|' \
23 -e 's|\@PLUGINDIR\@|$(plugindir)|' $< > $@
2024
21BUILT_SOURCES = $(plugin_DATA)25BUILT_SOURCES = $(plugin_DATA)
2226
23CLEANFILES = $(BUILT_SOURCES)27CLEANFILES = $(BUILT_SOURCES)
2428
25EXTRA_DIST = \29EXTRA_DIST = \
26 org-freedesktop-evolution-indicator.eplug.in30 org-freedesktop-evolution-indicator.eplug.xml
2731
=== renamed file 'src/org-freedesktop-evolution-indicator.eplug.in' => 'src/org-freedesktop-evolution-indicator.eplug.xml'
--- src/org-freedesktop-evolution-indicator.eplug.in 2010-03-02 19:34:48 +0000
+++ src/org-freedesktop-evolution-indicator.eplug.xml 2011-07-10 14:02:37 +0000
@@ -4,9 +4,10 @@
4 type="shlib" 4 type="shlib"
5 location="@PLUGINDIR@/liborg-freedesktop-evolution-indicator.so" 5 location="@PLUGINDIR@/liborg-freedesktop-evolution-indicator.so"
6 id="org.freedesktop.evolution_indicator" 6 id="org.freedesktop.evolution_indicator"
7 name="Evolution Indicator">7 domain="@GETTEXT_PACKAGE@"
8 _name="Evolution Indicator">
89
9 <description>Shows new mail count in a message indicator.</description>10 <_description>Shows new mail count in a message indicator.</_description>
10 <author name="Neil Jagdish Patel" email="neil.patel@canonical.com"/>11 <author name="Neil Jagdish Patel" email="neil.patel@canonical.com"/>
1112
12 <hook class="org.gnome.evolution.mail.events:1.0">13 <hook class="org.gnome.evolution.mail.events:1.0">
@@ -19,7 +20,7 @@
1920
20 <hook class="org.gnome.evolution.mail.config:1.0">21 <hook class="org.gnome.evolution.mail.config:1.0">
21 <group target="prefs" id="org.gnome.evolution.mail.prefs">22 <group target="prefs" id="org.gnome.evolution.mail.prefs">
22 <item type="section_table" path="00.general/30.options" label="When New Mail Arrives"></item>23 <item type="section_table" path="00.general/30.options" _label="When New Mail Arrives"></item>
23 <item type="item_table" path="00.general/40.options" factory="org_gnome_get_prefs"/>24 <item type="item_table" path="00.general/40.options" factory="org_gnome_get_prefs"/>
24 </group>25 </group>
25 </hook>26 </hook>

Subscribers

People subscribed via source and target branches