/pidgin/main: d816abf49b5e: Remove duplicates in makefile and ch...

[Ankit Vani]

Changeset: d816abf49b5e80db34704ed45a3313d0ad67b6a2
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-01-04 11:44 +0530
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/d816abf49b5e

Description:

Remove duplicates in makefile and changelog

diffstat:

 ChangeLog                  |  3 +--
 pidgin/plugins/Makefile.am |  7 -------
 2 files changed, 1 insertions(+), 9 deletions(-)

diffs (58 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,7 +12,6 @@ version 3.0.0 (??/??/????):
 	  the docklet notification. (Momchil) (#12598)
 	* Complete support for receiving a limited amount of history when
 	  joining a room. (Kha) (#15458)
-	* Add Unity integration plugin.
 
 	Finch:
 	* Support the conversation-extended signal for extending the
@@ -70,7 +69,7 @@ version 2.10.8:
 	* Add support for Python3 in build scripts. (Ashish Gupta) (#15624)
 
 	Pidgin:
-	* Add Unity integration plugin.
+	* Add a Unity integration plugin.
 
 	Gadu-Gadu:
 	* Disabled buddy list import/export from/to server (it didn't worked
diff --git a/pidgin/plugins/Makefile.am b/pidgin/plugins/Makefile.am
--- a/pidgin/plugins/Makefile.am
+++ b/pidgin/plugins/Makefile.am
@@ -47,7 +47,6 @@ spellchk_la_LDFLAGS         = -module -a
 themeedit_la_LDFLAGS        = -module -avoid-version
 unity_la_LDFLAGS            = -module -avoid-version
 webkit_la_LDFLAGS           = -module -avoid-version
-unity_la_LDFLAGS            = -module -avoid-version
 xmppconsole_la_LDFLAGS      = -module -avoid-version
 
 if PLUGINS
@@ -72,10 +71,6 @@ if ENABLE_UNITY
 plugin_LTLIBRARIES +=	unity.la
 endif
 
-if ENABLE_UNITY
-plugin_LTLIBRARIES +=	unity.la
-endif
-
 noinst_LTLIBRARIES = \
 	contact_priority.la \
 	gtk_signals_test.la
@@ -96,7 +91,6 @@ spellchk_la_SOURCES         = spellchk.c
 themeedit_la_SOURCES        = themeedit.c themeedit-icon.c themeedit-icon.h
 unity_la_SOURCES            = unity.c
 webkit_la_SOURCES           = webkit.c
-unity_la_SOURCES            = unity.c
 xmppconsole_la_SOURCES      = xmppconsole.c
 
 convcolors_la_LIBADD        = $(GTK_LIBS)
@@ -115,7 +109,6 @@ spellchk_la_LIBADD          = $(GTK_LIBS
 themeedit_la_LIBADD         = $(GTK_LIBS)
 unity_la_LIBADD             = $(GTK_LIBS) $(UNITY_LIBS)
 webkit_la_LIBADD            = $(GTK_LIBS) $(WEBKIT_LIBS)
-unity_la_LIBADD             = $(GTK_LIBS) $(UNITY_LIBS)
 xmppconsole_la_LIBADD       = $(GTK_LIBS)
 
 endif # PLUGINS