pidgin/pidgin

79ccaf2efd0b
Parents 3819525a346f
Children 1db9ef49bc22
Remove newline plugin, it's also handled by webkit themes
--- a/libpurple/plugins/Makefile.am Sun Feb 02 13:52:51 2014 +0100
+++ b/libpurple/plugins/Makefile.am Sun Feb 02 14:08:43 2014 +0100
@@ -34,7 +34,6 @@
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 @@
idle.la \
joinpart.la \
log_reader.la \
- newline.la \
offlinemsg.la \
psychic.la \
statenotify.la \
@@ -81,7 +79,6 @@
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 @@
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)
--- a/libpurple/plugins/Makefile.mingw Sun Feb 02 13:52:51 2014 +0100
+++ b/libpurple/plugins/Makefile.mingw Sun Feb 02 14:08:43 2014 +0100
@@ -68,7 +68,6 @@
idle.dll \
joinpart.dll \
log_reader.dll \
- newline.dll \
offlinemsg.dll \
psychic.dll \
statenotify.dll
--- a/libpurple/plugins/newline.c Sun Feb 02 13:52:51 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-/*
- * Displays messages on a new line, below the nick
- * Copyright (C) 2004 Stu Tomlinson <stu@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@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)