[Gaim-commits] CVS: gaim/src/protocols/napster napster.c,1.41,1.42

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/napster
In directory sc8-pr-cvs1:/tmp/cvs-serv8233/src/protocols/napster

Modified Files:
	napster.c 
Log Message:
I had a damn good commit message, but it was eaten. Let's try it again.

Announcing, Gaim Plugin API version 2.0, or GPAPIV2.0 for short.

There are lots'a cool thingies here.

Okay now, this isn't as cool as the previous message, but:

1) There's now a single entry function for all plugin types. It returns a
   detailed information structure on the plugin. This removes a lot of the
   ugliness from old plugins. Oh yeah, libicq wasn't converted to this, so
   if you use it, well, you shouldn't have used it anyway, but now you
   can't! bwahahaha. Use AIM/ICQ.

2) There are now 3 types of plugins: Standard, Loader, and Protocol
   plugins.

   Standard plugins are, well, standard, compiled plugins.

   Loader plugins load other plugins. For example, the perl support is now
   a loader plugin. It loads perl scripts. In the future, we'll have
   Ruby and Python loader plugins.

   Protocol plugins are, well, protocol plugins... yeah...

3) Plugins have unique IDs, so they can be referred to or automatically
   updated from a plugin database in the future. Neat, huh?

4) Plugins will have dependency support in the future, and can be hidden,
   so if you have, say, a logging core plugin, it won't have to show up,
   but then you load the GTK+ logging plugin and it'll auto-load the core
   plugin. Core/UI split plugins!

5) There will eventually be custom plugin signals and RPC of some sort, for
   the core/ui split plugins.

So, okay, back up .gaimrc.

I'd like to thank my parents for their support, javabsp for helping convert
a bunch of protocol plugins, and Etan for helping convert a bunch of
standard plugins.

Have fun. If you have any problems, please let me know, but you probably
won't have anything major happen. You will have to convert your plugins,
though, and I'm not guaranteeing that all perl scripts will still work.
I'll end up changing the perl script API eventually, so I know they won't
down the road. Don't worry, though. It'll be mass cool.

faceprint wants me to just commit the damn code already. So, here we go!!!

..

..

I need a massage. From a young, cute girl. Are there any young, cute girls
in the audience? IM me plz k thx.



Index: napster.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/napster/napster.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- napster.c	15 Apr 2003 04:17:58 -0000	1.41
+++ napster.c	25 Apr 2003 06:47:31 -0000	1.42
@@ -563,25 +563,23 @@
 		*se = "offline";
 }
 
-static struct prpl *my_protocol = NULL;
+static GaimPlugin *my_protocol = NULL;
 
+#if 0
 G_MODULE_EXPORT void napster_init(struct prpl *ret)
 {
 	struct proto_user_opt *puo;
 	ret->add_buddies = nap_add_buddies;
 	ret->remove_buddy = nap_remove_buddy;
-	ret->add_permit = NULL;
-	ret->rem_permit = NULL;
-	ret->add_deny = NULL;
-	ret->rem_deny = NULL;
-	ret->warn = NULL;
-	ret->chat_info = nap_chat_info;
-	ret->join_chat = nap_join_chat;
-	ret->chat_invite = NULL;
+//	ret->add_permit = NULL;
+//	ret->rem_permit = NULL;
+//	ret->add_deny = NULL;
+//	ret->rem_deny = NULL;
+//	ret->warn = NULL;
+//	ret->chat_invite = NULL;
 	ret->chat_leave = nap_chat_leave;
-	ret->chat_whisper = NULL;
-	ret->chat_send = nap_chat_send;
-	ret->keepalive = NULL;
+//	ret->chat_whisper = NULL;
+//	ret->keepalive = NULL;
 	ret->protocol = PROTO_NAPSTER;
 	ret->name = g_strdup("Napster");
 	ret->list_icon = nap_list_icon;
@@ -589,29 +587,26 @@
 	ret->login = nap_login;
 	ret->close = nap_close;
 	ret->send_im = nap_send_im;
-	ret->set_info = NULL;
-	ret->get_info = NULL;
-	ret->set_away = NULL;
-	ret->set_dir = NULL;
-	ret->get_dir = NULL;
-	ret->dir_search = NULL;
-	ret->set_idle = NULL;
-	ret->change_passwd = NULL;
+//	ret->set_info = NULL;
+//	ret->get_info = NULL;
+//	ret->set_away = NULL;
+//	ret->set_dir = NULL;
+//	ret->get_dir = NULL;
+//	ret->dir_search = NULL;
+//	ret->set_idle = NULL;
+//	ret->change_passwd = NULL;
 	ret->add_buddy = nap_add_buddy;
-	ret->add_buddies = nap_add_buddies;
-	ret->remove_buddy = nap_remove_buddy;
-	ret->add_permit = NULL;
-	ret->rem_permit = NULL;
-	ret->add_deny = NULL;
-	ret->rem_deny = NULL;
-	ret->warn = NULL;
+//	ret->add_permit = NULL;
+//	ret->rem_permit = NULL;
+//	ret->add_deny = NULL;
+//	ret->rem_deny = NULL;
+//	ret->warn = NULL;
 	ret->chat_info = nap_chat_info;
 	ret->join_chat = nap_join_chat;
-	ret->chat_invite = NULL;
-	ret->chat_leave = nap_chat_leave;
-	ret->chat_whisper = NULL;
+//	ret->chat_invite = NULL;
+//	ret->chat_whisper = NULL;
 	ret->chat_send = nap_chat_send;
-	ret->keepalive = NULL;
+//	ret->keepalive = NULL;
 
 	puo = g_new0(struct proto_user_opt, 1);
 	puo->label = g_strdup(_("Server:"));
@@ -636,3 +631,107 @@
 	prpl->plug->desc.api_version = PLUGIN_API_VERSION;
 }
 #endif
+#endif
+
+static GaimPluginProtocolInfo prpl_info =
+{
+	GAIM_PROTO_NAPSTER,
+	0,
+	NULL,
+	NULL,
+	nap_list_icon,
+	nap_list_emblems,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	nap_chat_info,
+	nap_login,
+	nap_close,
+	nap_send_im,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	nap_add_buddy,
+	nap_add_buddies,
+	nap_remove_buddy,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	nap_join_chat,
+	NULL,
+	nap_chat_leave,
+	NULL,
+	nap_chat_send,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static GaimPluginInfo info =
+{
+	2,                                                /**< api_version    */
+	GAIM_PLUGIN_PROTOCOL,                             /**< type           */
+	NULL,                                             /**< ui_requirement */
+	0,                                                /**< flags          */
+	NULL,                                             /**< dependencies   */
+	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
+
+	"prpl-napster",                                     /**< id             */
+	"NAPSTER",                                        /**< name           */
+	VERSION,                                          /**< version        */
+	                                                  /**  summary        */
+	N_("NAPSTER Protocol Plugin"),
+	                                                  /**  description    */
+	N_("NAPSTER Protocol Plugin"),
+	NULL,                                             /**< author         */
+	WEBSITE,                                          /**< homepage       */
+
+	NULL,                                             /**< load           */
+	NULL,                                             /**< unload         */
+	NULL,                                             /**< destroy        */
+
+	NULL,                                             /**< ui_info        */
+	&prpl_info                                        /**< extra_info     */
+};
+
+static void
+__init_plugin(GaimPlugin *plugin)
+{
+	struct proto_user_opt *puo;
+
+	puo = g_new0(struct proto_user_opt, 1);
+	puo->label = g_strdup("Server");
+	puo->def   = g_strdup(NAP_SERVER);
+	puo->pos   = USEROPT_NAPSERVER;
+	prpl_info.user_opts = g_list_append(prpl_info.user_opts, puo);
+
+	puo = g_new0(struct proto_user_opt, 1);
+	puo->label = g_strdup("Port:");
+	puo->def   = g_strdup("8888");
+	puo->pos   = USEROPT_NAPPORT;
+	prpl_info.user_opts = g_list_append(prpl_info.user_opts, puo);
+
+	my_protocol = plugin;
+}
+
+GAIM_INIT_PLUGIN(napster, __init_plugin, info);