Chix CVS chix_gaim/src chix_gaim.c,1.20,1.21

[xevuz <xe...@us...>]

Update of /cvsroot/chix/chix_gaim/src
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5068/src

Modified Files:
	chix_gaim.c 
Log Message:
mood settings

Index: chix_gaim.c
===================================================================
RCS file: /cvsroot/chix/chix_gaim/src/chix_gaim.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- chix_gaim.c	15 Jul 2007 10:04:19 -0000	1.20
+++ chix_gaim.c	15 Jul 2007 10:32:19 -0000	1.21
@@ -52,6 +52,7 @@
 typedef Chix_Event       ChixEvent;
 typedef Chix_Mesg        ChixMesg;
 typedef Chix_Mesg_Box    ChixMesgBox;
+typedef Chix_Mood_Type   ChixMoodType;
 
 /****************************************************************************
  * Event Handlers                                                           *
@@ -912,14 +913,13 @@
 
     /***************************************************************/
     g_snprintf(buf, sizeof(buf), _("%s's Info"),
-	       purple_connection_get_display_name(pc));
+            purple_connection_get_display_name(pc));
     g_snprintf(buf2, sizeof(buf2),
-	       _("<b> Chix ID:</b>\t\t%s\n<b> Provider:</b>\t%s\n"),
-	       info->id, info->provider);
+            _("Chix ID:\t\t%s\nProvider:\t%s\n"), info->id, info->provider);
     
     purple_request_fields(pc, _("Chix Info"), buf, buf2, fields,
-	                _("Update"), G_CALLBACK(__info_update_cb),
-	                _("Cancel"), NULL, NULL, NULL, NULL, pc->proto_data);
+            _("Update"), G_CALLBACK(__info_update_cb),
+            _("Cancel"), NULL, NULL, NULL, NULL, pc->proto_data);
 }
 
 static void
@@ -936,14 +936,15 @@
     PurpleRequestField      *field;
     PurpleConn              *pc;
     ChixClient              *cl;
+    ChixMoodType             mood;
 
-    pc = action->context;
-    cl = pc->proto_data;
+    pc   = action->context;
+    cl   = pc->proto_data;
+    mood = chix_client_mood_get(cl, NULL, 0);
 
     fields = purple_request_fields_new();
     group  = purple_request_field_group_new(_("Mood"));
-    field  = purple_request_field_choice_new("mood", _(""),
-            chix_clientcl->info->mood);
+    field  = purple_request_field_choice_new("mood", _(""), mood);
 
     purple_request_field_choice_add(field, _("Not in the mood"));
     purple_request_field_choice_add(field, _("Happy"));
@@ -958,9 +959,9 @@
     purple_request_field_group_add_field(group, field);
     purple_request_fields_add_group(fields, group);
 
-    purple_request_fields(pc, _("Chix Info"), buf, buf2, fields,
+    purple_request_fields(pc, _("Mood Settings"), NULL, NULL, fields,
 	                _("Update"), G_CALLBACK(__mood_update_cb),
-	                _("Cancel"), NULL, NULL, NULL, NULL, pc->proto_data);
+	                _("Cancel"), NULL, NULL, NULL, NULL, cl);
 }
 
 static GList *
@@ -983,6 +984,8 @@
     m = g_list_append(m, a);
     a = purple_plugin_action_new(_("Unblock Buddy"), unblock_buddy);
     m = g_list_append(m, a);
+    a = purple_plugin_action_new(_("Mood Settings"), cp_action_mood);
+    m = g_list_append(m, a);
     
     return m;
 }