/soc/2013/ashmew2/filetransferY: 975d95618338: Merged changes fr...

Ashish Gupta ashmew2 at gmail.com
Sun Feb 2 16:14:39 EST 2014


Changeset: 975d95618338758774d22832f84fb6d1456e2850
Author:	 Ashish Gupta <ashmew2 at gmail.com>
Date:	 2014-02-03 02:37 +0530
Branch:	 default
URL: https://hg.pidgin.im/soc/2013/ashmew2/filetransferY/rev/975d95618338

Description:

Merged changes from default

diffstat:

 libpurple/plugins/Makefile.am                |    4 -
 libpurple/plugins/Makefile.mingw             |    1 -
 libpurple/plugins/newline.c                  |  136 -----
 libpurple/plugins/perl/common/Makefile.PL.in |    4 +-
 libpurple/plugins/perl/common/Purple.pm      |    2 -
 pidgin/plugins/Makefile.am                   |    8 -
 pidgin/plugins/Makefile.mingw                |    1 -
 pidgin/plugins/convcolors.c                  |  464 -----------------
 pidgin/plugins/perl/common/Makefile.PL.in    |    4 +-
 pidgin/plugins/perl/common/Pidgin.pm         |    2 -
 pidgin/plugins/pidginrc.c                    |  699 ---------------------------
 11 files changed, 4 insertions(+), 1321 deletions(-)

diffs (truncated from 1500 to 300 lines):

diff --git a/libpurple/plugins/Makefile.am b/libpurple/plugins/Makefile.am
--- a/libpurple/plugins/Makefile.am
+++ b/libpurple/plugins/Makefile.am
@@ -34,7 +34,6 @@ helloworld_la_LDFLAGS       = -module -a
 idle_la_LDFLAGS             = -module -avoid-version
 joinpart_la_LDFLAGS         = -module -avoid-version
 log_reader_la_LDFLAGS       = -module -avoid-version
-newline_la_LDFLAGS          = -module -avoid-version
 notify_example_la_LDFLAGS   = -module -avoid-version
 offlinemsg_la_LDFLAGS       = -module -avoid-version
 one_time_password_la_LDFLAGS	= -module -avoid-version
@@ -55,7 +54,6 @@ plugin_LTLIBRARIES = \
 	idle.la             \
 	joinpart.la         \
 	log_reader.la       \
-	newline.la          \
 	offlinemsg.la       \
 	psychic.la          \
 	statenotify.la      \
@@ -81,7 +79,6 @@ helloworld_la_SOURCES       = helloworld
 idle_la_SOURCES             = idle.c
 joinpart_la_SOURCES         = joinpart.c
 log_reader_la_SOURCES       = log_reader.c
-newline_la_SOURCES          = newline.c
 notify_example_la_SOURCES   = notify_example.c
 offlinemsg_la_SOURCES       = offlinemsg.c
 one_time_password_la_SOURCES	= one_time_password.c
@@ -98,7 +95,6 @@ codeinline_la_LIBADD		= $(GLIB_LIBS)
 idle_la_LIBADD              = $(GLIB_LIBS)
 joinpart_la_LIBADD          = $(GLIB_LIBS)
 log_reader_la_LIBADD        = $(GLIB_LIBS)
-newline_la_LIBADD           = $(GLIB_LIBS)
 notify_example_la_LIBADD    = $(GLIB_LIBS)
 offlinemsg_la_LIBADD        = $(GLIB_LIBS)
 one_time_password_la_LIBADD = $(GLIB_LIBS)
diff --git a/libpurple/plugins/Makefile.mingw b/libpurple/plugins/Makefile.mingw
--- a/libpurple/plugins/Makefile.mingw
+++ b/libpurple/plugins/Makefile.mingw
@@ -68,7 +68,6 @@ plugins: \
 		idle.dll \
 		joinpart.dll \
 		log_reader.dll \
-		newline.dll \
 		offlinemsg.dll \
 		psychic.dll \
 		statenotify.dll
diff --git a/libpurple/plugins/newline.c b/libpurple/plugins/newline.c
deleted file mode 100644
--- a/libpurple/plugins/newline.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Displays messages on a new line, below the nick
- * Copyright (C) 2004 Stu Tomlinson <stu at nosnilmot.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
- */
-#include "internal.h"
-
-#include <string.h>
-
-#include <conversation.h>
-#include <debug.h>
-#include <plugin.h>
-#include <signals.h>
-#include <util.h>
-#include <version.h>
-
-static gboolean
-addnewline_msg_cb(PurpleAccount *account, char *sender, char **message,
-					 PurpleConversation *conv, int *flags, void *data)
-{
-	if ((PURPLE_IS_IM_CONVERSATION(conv) &&
-		 !purple_prefs_get_bool("/plugins/core/newline/im")) ||
-		(PURPLE_IS_CHAT_CONVERSATION(conv) &&
-		 !purple_prefs_get_bool("/plugins/core/newline/chat")))
-		return FALSE;
-
-	if (g_ascii_strncasecmp(*message, "/me ", strlen("/me "))) {
-		char *tmp = g_strdup_printf("<br/>%s", *message);
-		g_free(*message);
-		*message = tmp;
-	}
-
-	return FALSE;
-}
-
-static PurplePluginPrefFrame *
-get_plugin_pref_frame(PurplePlugin *plugin) {
-	PurplePluginPrefFrame *frame;
-	PurplePluginPref *ppref;
-
-	frame = purple_plugin_pref_frame_new();
-
-	ppref = purple_plugin_pref_new_with_name_and_label(
-			"/plugins/core/newline/im", _("Add new line in IMs"));
-	purple_plugin_pref_frame_add(frame, ppref);
-
-	ppref = purple_plugin_pref_new_with_name_and_label(
-			"/plugins/core/newline/chat", _("Add new line in Chats"));
-	purple_plugin_pref_frame_add(frame, ppref);
-
-	return frame;
-}
-
-
-static gboolean
-plugin_load(PurplePlugin *plugin)
-{
-	void *conversation = purple_conversations_get_handle();
-
-	purple_signal_connect(conversation, "writing-im-msg",
-						plugin, PURPLE_CALLBACK(addnewline_msg_cb), NULL);
-	purple_signal_connect(conversation, "writing-chat-msg",
-						plugin, PURPLE_CALLBACK(addnewline_msg_cb), NULL);
-
-	return TRUE;
-}
-
-static PurplePluginUiInfo prefs_info = {
-	get_plugin_pref_frame,
-	NULL,
-
-	/* Padding */
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-
-static PurplePluginInfo info =
-{
-	PURPLE_PLUGIN_MAGIC,							/**< magic			*/
-	PURPLE_MAJOR_VERSION,							/**< major version	*/
-	PURPLE_MINOR_VERSION,							/**< minor version	*/
-	PURPLE_PLUGIN_STANDARD,							/**< type			*/
-	NULL,											/**< ui_requirement	*/
-	0,												/**< flags			*/
-	NULL,											/**< dependencies	*/
-	PURPLE_PRIORITY_DEFAULT,						/**< priority		*/
-
-	"core-plugin_pack-newline",						/**< id				*/
-	N_("New Line"),									/**< name			*/
-	DISPLAY_VERSION,								/**< version		*/
-	N_("Prepends a newline to displayed message."),	/**< summary		*/
-	N_("Prepends a newline to messages so that the "
-	   "rest of the message appears below the "
-	   "username in the conversation window."),		/**< description	*/
-	"Stu Tomlinson <stu at nosnilmot.com>",			/**< author			*/
-	PURPLE_WEBSITE,									/**< homepage		*/
-
-	plugin_load,									/**< load			*/
-	NULL,											/**< unload			*/
-	NULL,											/**< destroy		*/
-
-	NULL,											/**< ui_info		*/
-	NULL,											/**< extra_info		*/
-	&prefs_info,									/**< prefs_info		*/
-	NULL,											/**< actions		*/
-
-	/* padding */
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-
-static void
-init_plugin(PurplePlugin *plugin) {
-	purple_prefs_add_none("/plugins/core/newline");
-	purple_prefs_add_bool("/plugins/core/newline/im", TRUE);
-	purple_prefs_add_bool("/plugins/core/newline/chat", TRUE);
-}
-
-PURPLE_INIT_PLUGIN(newline, init_plugin, info)
diff --git a/libpurple/plugins/perl/common/Makefile.PL.in b/libpurple/plugins/perl/common/Makefile.PL.in
--- a/libpurple/plugins/perl/common/Makefile.PL.in
+++ b/libpurple/plugins/perl/common/Makefile.PL.in
@@ -4,14 +4,14 @@ use ExtUtils::MakeMaker;
 # of the Makefile that is written.
 WriteMakefile(
     'NAME'              => 'Purple',
-    'VERSION_FROM'      => '@srcdir@/Purple.pm', # finds $VERSION
+    'VERSION'           => '@VERSION@',
     'PREREQ_PM'         => {}, # e.g., Module::Name => 1.1
     ($] >= 5.005 ? ## Add these new keywords supported since 5.005
       (ABSTRACT_FROM    => '@srcdir@/Purple.pm', # finds $ABSTRACT
        AUTHOR           => 'Purple <https://pidgin.im/>') : ()),
     'DEFINE'            => '@DEBUG_CFLAGS@ -Wno-float-equal',
     'dynamic_lib'       => { 'OTHERLDFLAGS' => '@LDFLAGS@' },
-    'INC'               => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_srcdir@/libpurple @GLIB_CFLAGS@',
+    'INC'               => '-I. -I at srcdir@ -I at top_srcdir@ -I at top_srcdir@/libpurple @GLIB_CFLAGS@ -DHAVE_CONFIG_H',
     'OBJECT'            => '$(O_FILES)', # link all the C files too
 #    'OPTIMIZE'          => '-g', # For debugging
     'INSTALLDIRS'          => 'vendor',
diff --git a/libpurple/plugins/perl/common/Purple.pm b/libpurple/plugins/perl/common/Purple.pm
--- a/libpurple/plugins/perl/common/Purple.pm
+++ b/libpurple/plugins/perl/common/Purple.pm
@@ -27,8 +27,6 @@ our @EXPORT = qw(
 	
 );
 
-our $VERSION = '0.01';
-
 sub AUTOLOAD {
 	# This AUTOLOAD is used to 'autoload' constants from the constant()
 	# XS function.
diff --git a/pidgin/plugins/Makefile.am b/pidgin/plugins/Makefile.am
--- a/pidgin/plugins/Makefile.am
+++ b/pidgin/plugins/Makefile.am
@@ -31,7 +31,6 @@ SUBDIRS = \
 
 plugindir = $(libdir)/pidgin
 
-convcolors_la_LDFLAGS       = -module -avoid-version
 contact_priority_la_LDFLAGS = -module -avoid-version
 extplacement_la_LDFLAGS     = -module -avoid-version
 gtk_signals_test_la_LDFLAGS = -module -avoid-version
@@ -40,7 +39,6 @@ history_la_LDFLAGS          = -module -a
 iconaway_la_LDFLAGS         = -module -avoid-version
 markerline_la_LDFLAGS       = -module -avoid-version
 notify_la_LDFLAGS           = -module -avoid-version
-pidginrc_la_LDFLAGS         = -module -avoid-version
 relnot_la_LDFLAGS           = -module -avoid-version
 sendbutton_la_LDFLAGS       = -module -avoid-version
 spellchk_la_LDFLAGS         = -module -avoid-version
@@ -52,14 +50,12 @@ xmppconsole_la_LDFLAGS      = -module -a
 if PLUGINS
 
 plugin_LTLIBRARIES = \
-	convcolors.la       \
 	extplacement.la     \
 	gtkbuddynote.la     \
 	history.la          \
 	iconaway.la         \
 	markerline.la       \
 	notify.la           \
-	pidginrc.la         \
 	relnot.la           \
 	sendbutton.la       \
 	spellchk.la         \
@@ -75,7 +71,6 @@ noinst_LTLIBRARIES = \
 	contact_priority.la \
 	gtk_signals_test.la
 
-convcolors_la_SOURCES       = convcolors.c
 contact_priority_la_SOURCES = contact_priority.c
 extplacement_la_SOURCES     = extplacement.c
 gtk_signals_test_la_SOURCES = gtk-signals-test.c
@@ -84,7 +79,6 @@ history_la_SOURCES          = history.c
 iconaway_la_SOURCES         = iconaway.c
 markerline_la_SOURCES       = markerline.c
 notify_la_SOURCES           = notify.c
-pidginrc_la_SOURCES         = pidginrc.c
 relnot_la_SOURCES           = relnot.c
 sendbutton_la_SOURCES       = sendbutton.c
 spellchk_la_SOURCES         = spellchk.c
@@ -93,7 +87,6 @@ unity_la_SOURCES            = unity.c
 webkit_la_SOURCES           = webkit.c
 xmppconsole_la_SOURCES      = xmppconsole.c
 
-convcolors_la_LIBADD        = $(GTK_LIBS)
 contact_priority_la_LIBADD  = $(GTK_LIBS)
 extplacement_la_LIBADD      = $(GTK_LIBS)
 gtk_signals_test_la_LIBADD  = $(GTK_LIBS)
@@ -102,7 +95,6 @@ history_la_LIBADD           = $(GTK_LIBS
 iconaway_la_LIBADD          = $(GTK_LIBS)
 markerline_la_LIBADD        = $(GTK_LIBS) $(WEBKIT_LIBS)
 notify_la_LIBADD            = $(GTK_LIBS)
-pidginrc_la_LIBADD          = $(GTK_LIBS)
 relnot_la_LIBADD            = $(GLIB_LIBS)
 sendbutton_la_LIBADD        = $(GTK_LIBS)
 spellchk_la_LIBADD          = $(GTK_LIBS)
diff --git a/pidgin/plugins/Makefile.mingw b/pidgin/plugins/Makefile.mingw
--- a/pidgin/plugins/Makefile.mingw
+++ b/pidgin/plugins/Makefile.mingw
@@ -100,7 +100,6 @@ plugins: \
 		iconaway.dll \
 		markerline.dll \
 		notify.dll \
-		pidginrc.dll \
 		relnot.dll \
 		sendbutton.dll \
 		spellchk.dll \
diff --git a/pidgin/plugins/convcolors.c b/pidgin/plugins/convcolors.c
deleted file mode 100644
--- a/pidgin/plugins/convcolors.c
+++ /dev/null



More information about the Commits mailing list