purple_ruby 0.6.4 → 0.6.5

data/History.txt

@@ -1,3 +1,7 @@
+== 0.6.5
+
+Compatible with 1.8 and 1.9
+
 == 0.6.4
 
 Add a noted problem on OSX.

data/ext/purple_ruby.c

@@ -47,6 +47,13 @@
 #include <arpa/inet.h>
 #include <fcntl.h>
 
+#ifndef RSTRING_PTR 
+#define RSTRING_PTR(s) (RSTRING(s)->ptr) 
+#endif 
+#ifndef RSTRING_LEN 
+#define RSTRING_LEN(s) (RSTRING(s)->len) 
+#endif
+
 #define PURPLE_GLIB_READ_COND  (G_IO_IN | G_IO_HUP | G_IO_ERR)
 #define PURPLE_GLIB_WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL)
 
@@ -169,7 +176,7 @@ void set_callback(VALUE* handler, const char* handler_name)
   
   if (rb_obj_class(*handler) != rb_cProc) {
     rb_raise(rb_eTypeError, "%s got unexpected value: %s", handler_name, 
-       RSTRING(inspect_rb_obj(*handler))->ptr);
+       RSTRING_PTR(inspect_rb_obj(*handler)));
   }
 }
 
@@ -177,7 +184,7 @@ void check_callback(VALUE handler, const char* handler_name){
   if (rb_obj_class(handler) != rb_cProc) {
     rb_raise(rb_eTypeError, "%s has unexpected value: %s",
       handler_name,
-      RSTRING(inspect_rb_obj(handler))->ptr);
+      RSTRING_PTR(inspect_rb_obj(handler)));
   }
 }
 
@@ -386,7 +393,7 @@ static VALUE init(int argc, VALUE* argv, VALUE self)
 
   if (!NIL_P(path)) {
     Check_Type(path, T_STRING);   
-		purple_util_set_user_dir(RSTRING(path)->ptr);
+		purple_util_set_user_dir(RSTRING_PTR(path));
 	}
 
   purple_core_set_ui_ops(&core_uiops);
@@ -553,7 +560,7 @@ static VALUE watch_incoming_ipc(VALUE self, VALUE serverip, VALUE port)
 
 	memset(&my_addr, 0, sizeof(struct sockaddr_in));
 	my_addr.sin_family = AF_INET;
-	my_addr.sin_addr.s_addr = inet_addr(RSTRING(serverip)->ptr);
+	my_addr.sin_addr.s_addr = inet_addr(RSTRING_PTR(serverip));
 	my_addr.sin_port = htons(FIX2INT(port));
 	if (bind(soc, (struct sockaddr*)&my_addr, sizeof(struct sockaddr)) != 0)
 	{
@@ -596,11 +603,11 @@ static VALUE watch_timer(VALUE self, VALUE delay)
 
 static VALUE login(VALUE self, VALUE protocol, VALUE username, VALUE password)
 {
-  PurpleAccount* account = purple_account_new(RSTRING(username)->ptr, RSTRING(protocol)->ptr);
+  PurpleAccount* account = purple_account_new(RSTRING_PTR(username), RSTRING_PTR(protocol));
   if (NULL == account || NULL == account->presence) {
-    rb_raise(rb_eRuntimeError, "No able to create account: %s", RSTRING(protocol)->ptr);
+    rb_raise(rb_eRuntimeError, "No able to create account: %s", RSTRING_PTR(protocol));
   }
-  purple_account_set_password(account, RSTRING(password)->ptr);
+  purple_account_set_password(account, RSTRING_PTR(password));
   purple_account_set_remember_password(account, TRUE);
   purple_account_set_enabled(account, UI_ID, TRUE);
   PurpleSavedStatus *status = purple_savedstatus_new(NULL, PURPLE_STATUS_AVAILABLE);
@@ -644,7 +651,7 @@ static VALUE send_im(VALUE self, VALUE name, VALUE message)
   Data_Get_Struct(self, PurpleAccount, account);
   
   if (purple_account_is_connected(account)) {
-    int i = serv_send_im(purple_account_get_connection(account), RSTRING(name)->ptr, RSTRING(message)->ptr, 0);
+    int i = serv_send_im(purple_account_get_connection(account), RSTRING_PTR(name), RSTRING_PTR(message), 0);
     return INT2FIX(i);
   } else {
     return Qnil;
@@ -676,7 +683,7 @@ static VALUE get_bool_setting(VALUE self, VALUE name, VALUE default_value)
 {
   PurpleAccount *account;
   Data_Get_Struct(self, PurpleAccount, account);
-  gboolean value = purple_account_get_bool(account, RSTRING(name)->ptr, 
+  gboolean value = purple_account_get_bool(account, RSTRING_PTR(name), 
     (default_value == Qfalse || default_value == Qnil) ? FALSE : TRUE); 
   return (TRUE == value) ? Qtrue : Qfalse;
 }
@@ -685,7 +692,7 @@ static VALUE get_string_setting(VALUE self, VALUE name, VALUE default_value)
 {
   PurpleAccount *account;
   Data_Get_Struct(self, PurpleAccount, account);
-  const char* value = purple_account_get_string(account, RSTRING(name)->ptr, RSTRING(default_value)->ptr);
+  const char* value = purple_account_get_string(account, RSTRING_PTR(name), RSTRING_PTR(default_value));
   return (NULL == value) ? Qnil : rb_str_new2(value);
 }
 
@@ -713,7 +720,7 @@ static VALUE add_buddy(VALUE self, VALUE buddy)
   PurpleAccount *account;
   Data_Get_Struct(self, PurpleAccount, account);
   
-	PurpleBuddy* pb = purple_buddy_new(account, RSTRING(buddy)->ptr, NULL);
+	PurpleBuddy* pb = purple_buddy_new(account, RSTRING_PTR(buddy), NULL);
   
   char* group = _("Buddies");
   PurpleGroup* grp = purple_find_group(group);
@@ -733,9 +740,9 @@ static VALUE remove_buddy(VALUE self, VALUE buddy)
   PurpleAccount *account;
   Data_Get_Struct(self, PurpleAccount, account);
   
-	PurpleBuddy* pb = purple_find_buddy(account, RSTRING(buddy)->ptr);
+	PurpleBuddy* pb = purple_find_buddy(account, RSTRING_PTR(buddy));
 	if (NULL == pb) {
-	  rb_raise(rb_eRuntimeError, "Failed to remove buddy for %s : %s does not exist", purple_account_get_username(account), RSTRING(buddy)->ptr);
+	  rb_raise(rb_eRuntimeError, "Failed to remove buddy for %s : %s does not exist", purple_account_get_username(account), RSTRING_PTR(buddy));
 	}
 	
 	char* group = _("Buddies");
@@ -755,7 +762,7 @@ static VALUE has_buddy(VALUE self, VALUE buddy)
 {
   PurpleAccount *account;
   Data_Get_Struct(self, PurpleAccount, account);
-  if (purple_find_buddy(account, RSTRING(buddy)->ptr) != NULL) {
+  if (purple_find_buddy(account, RSTRING_PTR(buddy)) != NULL) {
     return Qtrue;
   } else {
     return Qfalse;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: purple_ruby
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - yong
@@ -35,7 +35,7 @@ dependencies:
   type: :development
   version_requirements: *id001
 description: A ruby gem to write server that sends and recives IM messages
-email: yong@intridea.com
+email: yong@intridea.com dingding@intridea.com
 executables: []
 
 extensions: