gnome-mud r784 - in trunk: . src ui

[lharris svn gnome org]

Author: lharris
Date: Thu Mar  5 03:33:06 2009
New Revision: 784
URL: http://svn.gnome.org/viewvc/gnome-mud?rev=784&view=rev

Log:
Removed old plugin support

Removed:
   trunk/PLUGIN.API
   trunk/src/modules-structures.h
   trunk/src/modules.c
   trunk/src/modules.h
   trunk/src/modules_api.c
   trunk/src/modules_api.h
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/gnome-mud.c
   trunk/src/mud-connection-view.c
   trunk/src/mud-window.c
   trunk/src/mud-window.h
   trunk/ui/main.glade

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Thu Mar  5 03:33:06 2009
@@ -1,4 +1,4 @@
-SUBDIRS = data doc plugins po src ui
+SUBDIRS = data doc po src ui
 
 @INTLTOOL_SCHEMAS_RULE@
 @INTLTOOL_DESKTOP_RULE@
@@ -22,7 +22,6 @@
 	ChangeLog \
 	INSTALL \
 	NEWS \
-	PLUGIN.API \
 	README \
 	ROADMAP \
 	config.rpath \

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Mar  5 03:33:06 2009
@@ -146,7 +146,6 @@
   data/icons/Makefile
   doc/Makefile
   src/Makefile
-  plugins/Makefile
   po/Makefile.in
   ui/Makefile
 ])

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Mar  5 03:33:06 2009
@@ -22,11 +22,6 @@
 	gnome-mud.c				\
 	gnome-mud.h				\
 	gnome-mud-icons.h \
-	modules_api.c				\
-	modules_api.h				\
-	modules.c				\
-	modules.h				\
-	modules-structures.h		\
 	mud-connection-view.c		\
 	mud-connections.c \
 	mud-connections.h \

Modified: trunk/src/gnome-mud.c
==============================================================================
--- trunk/src/gnome-mud.c	(original)
+++ trunk/src/gnome-mud.c	Thu Mar  5 03:33:06 2009
@@ -38,7 +38,6 @@
 #include "mud-connection-view.h"
 #include "mud-window.h"
 #include "mud-profile.h"
-#include "modules.h"
 #include "utils.h"
 #include "debug-logger.h"
 
@@ -83,10 +82,6 @@
     if(!g_file_test(buf, G_FILE_TEST_IS_DIR))
         mkdir(buf, 0777);
 
-    g_snprintf(buf, 2048, "%s/.gnome-mud/plugins/", g_get_home_dir());
-    if(!g_file_test(buf, G_FILE_TEST_IS_DIR))
-        mkdir(buf, 0777 );
-
     g_snprintf(buf, 2048, "%s/.gnome-mud/logs/", g_get_home_dir());
     if(!g_file_test(buf, G_FILE_TEST_IS_DIR))
         mkdir(buf, 0777 );
@@ -95,9 +90,6 @@
     if(!g_file_test(buf, G_FILE_TEST_IS_DIR))
         mkdir(buf, 0777 );
 
-    init_modules(buf);
-    init_modules(PKGDATADIR);
-
     gtk_about_dialog_set_url_hook(utils_activate_url, NULL, NULL);
 
     mud_profile_load_profiles();

Modified: trunk/src/mud-connection-view.c
==============================================================================
--- trunk/src/mud-connection-view.c	(original)
+++ trunk/src/mud-connection-view.c	Thu Mar  5 03:33:06 2009
@@ -49,9 +49,6 @@
 #include "mud-telnet-msp.h"
 #endif
 
-/* Hack, will refactor with plugin rewrite -lh */
-extern gboolean PluginGag;
-
 struct _MudConnectionViewPrivate
 {
     gint id;
@@ -740,10 +737,6 @@
                 error = NULL;
             }
 
-            // Give plugins first crack at it.
-            mud_window_handle_plugins(view->priv->window, view->priv->id,
-                    (gchar *)text, strlen(text), 0);
-
             if(conv_text == NULL)
                 gnet_conn_write(view->connection, text, strlen(text));
             else
@@ -1228,13 +1221,7 @@
                             buf);
                     view->local_echo = temp;
 
-                    mud_window_handle_plugins(view->priv->window, view->priv->id,
-                            buf, length, 1);
-
-                    pluggag = PluginGag;
-                    PluginGag = FALSE;
-
-                    if(!gag && !pluggag)
+                    if(!gag)
                     {
                         vte_terminal_feed(VTE_TERMINAL(view->priv->terminal),
                                 buf, length);

Modified: trunk/src/mud-window.c
==============================================================================
--- trunk/src/mud-window.c	(original)
+++ trunk/src/mud-window.c	Thu Mar  5 03:33:06 2009
@@ -38,7 +38,6 @@
 #include "mud-preferences-window.h"
 #include "mud-window.h"
 #include "mud-tray.h"
-#include "modules.h"
 #include "mud-profile.h"
 #include "mud-window-profile.h"
 #include "mud-parse-base.h"
@@ -179,9 +178,6 @@
     self->priv->image = glade_xml_get_widget(glade, "image");
     self->priv->tray = mud_tray_new(self, self->priv->window);
 
-    // FIXME: Get rid of this stupid global
-    pluginMenu = glade_xml_get_widget(glade, "plugin_menu_menu");
-
     /* connect quit buttons */
     g_signal_connect(self->priv->window,
                      "destroy",
@@ -264,11 +260,6 @@
                      G_CALLBACK(mud_window_notebook_page_change),
                      self);
 
-    g_signal_connect(glade_xml_get_widget(glade, "plugin_list"),
-                     "activate",
-                     G_CALLBACK(do_plugin_information),
-                     NULL);
-
     g_signal_connect(self->priv->window,
                      "configure-event",
                      G_CALLBACK(mud_window_configure_event),
@@ -918,75 +909,6 @@
                      self);
 }
     
-void
-mud_window_handle_plugins(MudWindow *self, gint id, gchar *data, guint length, gint dir)
-{
-    GSList *entry, *viewlist;
-    MudViewEntry *mudview;
-    GList *plugin_list;
-    PLUGIN_DATA *pd;
-
-    g_return_if_fail(IS_MUD_WINDOW(self));
-
-    viewlist = self->priv->mud_views_list;
-
-    for(entry = viewlist; entry != NULL; entry = g_slist_next(entry))
-    {
-        mudview = (MudViewEntry *)entry->data;
-
-        if(mudview->id == id)
-        {
-            if(dir)
-            {
-                for(plugin_list = g_list_first(Plugin_data_list); plugin_list != NULL; plugin_list = plugin_list->next)
-                {
-                    if(plugin_list->data != NULL)
-                    {
-                        pd = (PLUGIN_DATA *)plugin_list->data;
-
-                        if(pd->plugin && pd->plugin->enabled && (pd->dir == PLUGIN_DATA_IN))
-                        {
-                            GString *buf = g_string_new(NULL);
-                            int i;
-
-                            for(i = 0; i < length; i++)
-                                g_string_append_c(buf, data[i]);
-
-                            (*pd->datafunc)(pd->plugin, buf->str, length, mudview->view);
-
-                            g_string_free(buf, FALSE);
-                        }
-                    }
-                }
-            }
-            else
-            {
-
-                for(plugin_list = g_list_first(Plugin_data_list); plugin_list != NULL; plugin_list = plugin_list->next)
-                {
-                    if(plugin_list->data != NULL)
-                    {
-                        pd = (PLUGIN_DATA *)plugin_list->data;
-
-                        if(pd->plugin && pd->plugin->enabled && (pd->dir == PLUGIN_DATA_OUT))
-                        {
-                            GString *buf = g_string_new(NULL);
-                            int i;
-
-                            for(i = 0; i < length; i++)
-                                g_string_append_c(buf, data[i]);
-
-                            (*pd->datafunc)(pd->plugin, buf->str, length, mudview->view);
-
-                            g_string_free(buf, FALSE);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
 GtkWidget*
 mud_window_get_window(MudWindow *self)
 {

Modified: trunk/src/mud-window.h
==============================================================================
--- trunk/src/mud-window.h	(original)
+++ trunk/src/mud-window.h	Thu Mar  5 03:33:06 2009
@@ -53,15 +53,12 @@
 GType mud_window_get_type (void);
 
 void mud_window_add_connection_view(MudWindow *window, GObject *view, gchar *tabLbl);
-void mud_window_handle_plugins(MudWindow *window, gint id, gchar *data, guint length, gint dir);
 void mud_window_populate_profiles_menu(MudWindow *window);
 void mud_window_profile_menu_set_active(MudWindow *window, gchar *name);
 void mud_window_close_current_window(MudWindow *window);
 void mud_window_disconnected(MudWindow *window);
 GtkWidget* mud_window_get_window(MudWindow *window);
 
-extern GtkWidget *pluginMenu;
-
 G_END_DECLS
 
 #endif /* MUD_WINDOW_H */

Modified: trunk/ui/main.glade
==============================================================================
--- trunk/ui/main.glade	(original)
+++ trunk/ui/main.glade	Thu Mar  5 03:33:06 2009
@@ -193,42 +193,6 @@
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkMenuItem" id="plugin_menu">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Plugins</property>
-                        <property name="use_underline">True</property>
-                        <child>
-                          <widget class="GtkMenu" id="plugin_menu_menu">
-                            <child>
-                              <widget class="GtkSeparatorMenuItem" id="separator9">
-                                <property name="visible">True</property>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkImageMenuItem" id="plugin_list">
-                                <property name="label" translatable="yes">Plugin _Information...</property>
-                                <property name="visible">True</property>
-                                <property name="use_underline">True</property>
-                                <property name="use_stock">False</property>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="image8">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-dialog-info</property>
-                                    <property name="icon-size">1</property>
-                                  </widget>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkSeparatorMenuItem" id="separator8">
-                        <property name="visible">True</property>
-                      </widget>
-                    </child>
-                    <child>
                       <widget class="GtkImageMenuItem" id="menu_preferences">
                         <property name="label">gtk-preferences</property>
                         <property name="visible">True</property>