changeset 139:c009c4f4ad02

[gaim-migrate @ 149] Decided I wasn't going to implement a generic unload_plugin, and decided I liked the plugin box interface, and decided to make that the only interface. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Wed, 19 Apr 2000 20:28:02 +0000
parents e8ea1e2fdf0c
children 436bead8f65d
files src/buddy.c src/gaim.h src/plugins.c
diffstat 3 files changed, 6 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/src/buddy.c	Wed Apr 19 12:36:18 2000 +0000
+++ b/src/buddy.c	Wed Apr 19 20:28:02 2000 +0000
@@ -1724,19 +1724,8 @@
 
         gaim_new_item(menu, "Preferences", GTK_SIGNAL_FUNC(show_prefs));
 
-#ifdef GAIM_PLUGINS
-	menu = gtk_menu_new();
-
-	menuitem = gaim_new_item(NULL, "Plugins", NULL);
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
-	gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem);
+        gaim_new_item(menu, "Plugins", GTK_SIGNAL_FUNC(show_plugins));
 
-	gaim_new_item(menu, "Load Plugin", GTK_SIGNAL_FUNC(load_plugin));
-	/* FIXME */
-	gaim_new_item(menu, "Remove Plugin", GTK_SIGNAL_FUNC(show_plugins));
-	gaim_new_item(menu, "Show Plugins", GTK_SIGNAL_FUNC(show_plugins));
-#endif
-	
 	menu = gtk_menu_new();
 
 	menuitem = gaim_new_item(NULL, "Help", NULL);
--- a/src/gaim.h	Wed Apr 19 12:36:18 2000 +0000
+++ b/src/gaim.h	Wed Apr 19 20:28:02 2000 +0000
@@ -295,7 +295,7 @@
 #define TYPE_SIGNOFF   4
 #define TYPE_KEEPALIVE 5
 
-#define REVISION "gaim:$Revision: 146 $"
+#define REVISION "gaim:$Revision: 149 $"
 #define FLAPON "FLAPON\r\n\r\n"
 
 #define ROAST "Tic/Toc"
@@ -568,9 +568,7 @@
 
 #ifdef GAIM_PLUGINS
 /* Functions in plugins.c */
-extern void load_plugin  (GtkWidget *, gpointer);
-extern void unload_plugin(GtkWidget *, gpointer);
-extern void show_plugins (GtkWidget *, gpointer);
+extern void show_plugins(GtkWidget *, gpointer);
 extern void gaim_signal_connect(void *, enum gaim_event, void *, void *);
 extern void gaim_signal_disconnect(void *, enum gaim_event, void *);
 #endif
--- a/src/plugins.c	Wed Apr 19 12:36:18 2000 +0000
+++ b/src/plugins.c	Wed Apr 19 20:28:02 2000 +0000
@@ -61,14 +61,13 @@
 
 /* --------------- Function Declarations --------------------- */
 
-       void load_plugin  (GtkWidget *, gpointer);
-       void unload_plugin(GtkWidget *, gpointer);
        void show_plugins (GtkWidget *, gpointer);
 
        void gaim_signal_connect   (void *, enum gaim_event, void *, void *);
        void gaim_signal_disconnect(void *, enum gaim_event, void *);
 
 static void destroy_plugins  (GtkWidget *, gpointer);
+static void load_plugin  (GtkWidget *, gpointer);
 static void load_which_plugin(GtkWidget *, gpointer);
 static void unload           (GtkWidget *, gpointer);
 static void list_clicked     (GtkWidget *, struct gaim_plugin *);
@@ -83,7 +82,7 @@
 	plugin_dialog = NULL;
 }
 
-void load_plugin(GtkWidget *w, gpointer data)
+static void load_plugin(GtkWidget *w, gpointer data)
 {
 	char *buf = g_malloc(BUF_LEN);
  
@@ -120,7 +119,7 @@
 	gdk_window_raise(plugin_dialog->window);   
 }
 
-void load_which_plugin(GtkWidget *w, gpointer data) {
+static void load_which_plugin(GtkWidget *w, gpointer data) {
 	struct gaim_plugin *plug;
 	void (*gaim_plugin_init)();
 	char *(*cfunc)();
@@ -170,10 +169,6 @@
 	update_show_plugins();
 }
 
-void unload_plugin(GtkWidget *w, gpointer data) {
-	/* FIXME */
-}
-
 void show_plugins(GtkWidget *w, gpointer data) {
 	/* most of this code was shamelessly stolen from prefs.c */
 	GtkWidget *page;