[Ruburple-submits] [35] trunk/ruburple: moved classes around abit
nobody at rubyforge.org
nobody at rubyforge.org
Sun May 13 17:06:14 EDT 2007
Revision: 35
Author: zond
Date: 2007-05-13 17:06:14 -0400 (Sun, 13 May 2007)
Log Message:
-----------
moved classes around abit
Modified Paths:
--------------
trunk/ruburple/ext/ruburple_ext.c
trunk/ruburple/tests/ruburple_test.rb
Modified: trunk/ruburple/ext/ruburple_ext.c
===================================================================
--- trunk/ruburple/ext/ruburple_ext.c 2007-05-13 16:00:26 UTC (rev 34)
+++ trunk/ruburple/ext/ruburple_ext.c 2007-05-13 21:06:14 UTC (rev 35)
@@ -53,8 +53,8 @@
static VALUE rb_ruburple_protocol_account_conversation;
static VALUE rb_ruburple_protocol_account_chat;
static VALUE rb_ruburple_protocol_account_savedstatus;
+static VALUE rb_ruburple_protocol_account_status;
static VALUE rb_ruburple_protocol_connection;
-static VALUE rb_ruburple_blist_status;
static VALUE rb_ruburple_blist;
static VALUE rb_ruburple_blist_buddy_icon;
static VALUE rb_ruburple_blist_buddy;
@@ -113,7 +113,7 @@
#define RB_RUBURPLE_PROTOCOL(purple_plugin_pointer) Data_Wrap_Struct(rb_ruburple_protocol, NULL, NULL, purple_plugin_pointer)
#define RB_RUBURPLE_PLUGIN(purple_plugin_pointer) Data_Wrap_Struct(rb_ruburple_plugin, NULL, NULL, purple_plugin_pointer)
#define RB_RUBURPLE_PROTOCOL_INFO(purple_plugin_info_pointer) Data_Wrap_Struct(rb_ruburple_protocol_info, NULL, NULL, purple_plugin_info_pointer)
-#define RB_RUBURPLE_BLIST_STATUS(purple_status_pointer) Data_Wrap_Struct(rb_ruburple_blist_status, NULL, NULL, purple_status_pointer)
+#define RB_RUBURPLE_PROTOCOL_ACCOUNT_STATUS(purple_status_pointer) Data_Wrap_Struct(rb_ruburple_protocol_account_status, NULL, NULL, purple_status_pointer)
#define RB_RUBURPLE_BLIST(purple_blist_pointer) Data_Wrap_Struct(rb_ruburple_blist, NULL, NULL, purple_blist_pointer)
#define RB_RUBURPLE_BLIST_BUDDY(purple_buddy_pointer) Data_Wrap_Struct(rb_ruburple_blist_buddy, NULL, NULL, purple_buddy_pointer)
#define RB_RUBURPLE_BLIST_NODE(purple_blist_node_pointer) Data_Wrap_Struct(rb_ruburple_blist_node, NULL, NULL, purple_blist_node_pointer)
@@ -139,7 +139,7 @@
#define RUBURPLE_SIGNAL_HANDLER(rb_ruburple_subscription,ruburple_signal_handler_pointer) Data_Get_Struct(rb_ruburple_subscription, RuburpleSignalHandler, ruburple_signal_handler_pointer)
#define PURPLE_CONNECTION(rb_ruburple_protocol_connection,purple_connection_pointer) Data_Get_Struct(rb_ruburple_protocol_connection, PurpleConnection, purple_connection_pointer)
#define PURPLE_BUDDY(rb_ruburple_blist_buddy,purple_buddy_pointer) Data_Get_Struct(rb_ruburple_blist_buddy, PurpleBuddy, purple_buddy_pointer)
-#define PURPLE_STATUS(rb_ruburple_blist_status,purple_status_pointer) Data_Get_Struct(rb_ruburple_blist_status, PurpleStatus, purple_status_pointer)
+#define PURPLE_STATUS(rb_ruburple_protocol_account_status,purple_status_pointer) Data_Get_Struct(rb_ruburple_protocol_account_status, PurpleStatus, purple_status_pointer)
#define GPOINTER(rb_ruburple_pointer,gpointer) Data_Get_Struct(rb_ruburple_pointer, void, gpointer)
/*
@@ -768,7 +768,7 @@
PURPLE_ACCOUNT(self, account);
status = (PurpleStatus *) call_and_get_result(ruburple_protocol_account_get_status, (gpointer) account);
RETURN_QNIL_IF_NULL(status);
- return RB_RUBURPLE_BLIST_STATUS(status);
+ return RB_RUBURPLE_PROTOCOL_ACCOUNT_STATUS(status);
}
static gpointer
@@ -877,7 +877,7 @@
return(RB_RUBURPLE_CIPHER((PurpleCipher *) data));
break;
case PURPLE_SUBTYPE_STATUS:
- return(RB_RUBURPLE_BLIST_STATUS((PurpleStatus *) data));
+ return(RB_RUBURPLE_PROTOCOL_ACCOUNT_STATUS((PurpleStatus *) data));
break;
case PURPLE_SUBTYPE_LOG:
return(RB_RUBURPLE_LOG((PurpleLog *) data));
@@ -1404,18 +1404,18 @@
}
static gpointer
-ruburple_blist_status_get_name(gpointer data)
+ruburple_protocol_account_status_get_name(gpointer data)
{
PurpleStatus *status = (PurpleStatus *) data;
return (gpointer) purple_status_get_name(status);
}
static VALUE
-rb_ruburple_blist_status_get_name(VALUE self)
+rb_ruburple_protocol_account_status_get_name(VALUE self)
{
PurpleStatus *status;
PURPLE_STATUS(self, status);
- return rb_str_new2((char *) call_and_get_result(ruburple_blist_status_get_name, (gpointer) status));
+ return rb_str_new2((char *) call_and_get_result(ruburple_protocol_account_status_get_name, (gpointer) status));
}
static VALUE
@@ -1446,7 +1446,7 @@
{
PurpleBuddy *buddy;
PURPLE_BUDDY(self, buddy);
- return RB_RUBURPLE_BLIST_STATUS((PurpleStatus *) call_and_get_result(ruburple_blist_buddy_get_status, (gpointer) buddy));
+ return RB_RUBURPLE_PROTOCOL_ACCOUNT_STATUS((PurpleStatus *) call_and_get_result(ruburple_blist_buddy_get_status, (gpointer) buddy));
}
#ifdef __cplusplus
@@ -1533,7 +1533,7 @@
rb_define_method(rb_ruburple_protocol, "author", rb_protocol_get_author, 0);
rb_define_method(rb_ruburple_protocol, "homepage", rb_protocol_get_homepage, 0);
- rb_ruburple_protocol_account = rb_define_class_under(rb_ruburple, "Account", rb_cObject);
+ rb_ruburple_protocol_account = rb_define_class_under(rb_ruburple_protocol, "Account", rb_cObject);
rb_define_method(rb_ruburple_protocol_account, "password=", rb_ruburple_protocol_account_set_password, 1);
rb_define_method(rb_ruburple_protocol_account, "connect", rb_ruburple_protocol_account_connect, 0);
rb_define_method(rb_ruburple_protocol_account, "enabled=", rb_ruburple_protocol_account_set_enabled, 1);
@@ -1558,16 +1558,16 @@
rb_ruburple_blist = rb_define_class_under(rb_ruburple, "BuddyList", rb_cObject);
- rb_ruburple_blist_status = rb_define_class_under(rb_ruburple_blist, "Status", rb_cObject);
- rb_define_method(rb_ruburple_blist_status, "name", rb_ruburple_blist_status_get_name, 0);
- rb_define_const(rb_ruburple_blist_status, "STATUS_UNSET", INT2NUM(PURPLE_STATUS_UNSET));
- rb_define_const(rb_ruburple_blist_status, "STATUS_OFFLINE", INT2NUM(PURPLE_STATUS_OFFLINE));
- rb_define_const(rb_ruburple_blist_status, "STATUS_AVAILABLE", INT2NUM(PURPLE_STATUS_AVAILABLE));
- rb_define_const(rb_ruburple_blist_status, "STATUS_UNAVAILABLE", INT2NUM(PURPLE_STATUS_UNAVAILABLE));
- rb_define_const(rb_ruburple_blist_status, "STATUS_INVISIBLE", INT2NUM(PURPLE_STATUS_INVISIBLE));
- rb_define_const(rb_ruburple_blist_status, "STATUS_AWAY", INT2NUM(PURPLE_STATUS_AWAY));
- rb_define_const(rb_ruburple_blist_status, "STATUS_EXTENDED_AWAY", INT2NUM(PURPLE_STATUS_EXTENDED_AWAY));
- rb_define_const(rb_ruburple_blist_status, "STATUS_MOBILE", INT2NUM(PURPLE_STATUS_MOBILE));
+ rb_ruburple_protocol_account_status = rb_define_class_under(rb_ruburple_protocol_account, "Status", rb_cObject);
+ rb_define_method(rb_ruburple_protocol_account_status, "name", rb_ruburple_protocol_account_status_get_name, 0);
+ rb_define_const(rb_ruburple_protocol_account_status, "STATUS_UNSET", INT2NUM(PURPLE_STATUS_UNSET));
+ rb_define_const(rb_ruburple_protocol_account_status, "STATUS_OFFLINE", INT2NUM(PURPLE_STATUS_OFFLINE));
+ rb_define_const(rb_ruburple_protocol_account_status, "STATUS_AVAILABLE", INT2NUM(PURPLE_STATUS_AVAILABLE));
+ rb_define_const(rb_ruburple_protocol_account_status, "STATUS_UNAVAILABLE", INT2NUM(PURPLE_STATUS_UNAVAILABLE));
+ rb_define_const(rb_ruburple_protocol_account_status, "STATUS_INVISIBLE", INT2NUM(PURPLE_STATUS_INVISIBLE));
+ rb_define_const(rb_ruburple_protocol_account_status, "STATUS_AWAY", INT2NUM(PURPLE_STATUS_AWAY));
+ rb_define_const(rb_ruburple_protocol_account_status, "STATUS_EXTENDED_AWAY", INT2NUM(PURPLE_STATUS_EXTENDED_AWAY));
+ rb_define_const(rb_ruburple_protocol_account_status, "STATUS_MOBILE", INT2NUM(PURPLE_STATUS_MOBILE));
rb_ruburple_protocol_connection = rb_define_class_under(rb_ruburple_protocol, "Connection", rb_cObject);
rb_define_method(rb_ruburple_protocol_connection, "send_im", rb_ruburple_protocol_connection_send_im, -1);
Modified: trunk/ruburple/tests/ruburple_test.rb
===================================================================
--- trunk/ruburple/tests/ruburple_test.rb 2007-05-13 16:00:26 UTC (rev 34)
+++ trunk/ruburple/tests/ruburple_test.rb 2007-05-13 21:06:14 UTC (rev 35)
@@ -74,8 +74,8 @@
e.account.username == a2.username
end
end
- a1.savedstatus = Ruburple::Account::SavedStatus.new(Ruburple::BuddyList::Status::STATUS_AVAILABLE)
- a2.savedstatus = Ruburple::Account::SavedStatus.new(Ruburple::BuddyList::Status::STATUS_AVAILABLE)
+ a1.savedstatus = Ruburple::Protocol::Account::SavedStatus.new(Ruburple::Protocol::Account::Status::STATUS_AVAILABLE)
+ a2.savedstatus = Ruburple::Protocol::Account::SavedStatus.new(Ruburple::Protocol::Account::Status::STATUS_AVAILABLE)
puts "testing buddies..."
sleep 2
assert(a2.has_buddy?(a1.username))
More information about the Ruburple-submits
mailing list