Chix CVS chix_gaim/src Makefile.am,1.5,1.6 chix_gaim.c,1.15,1.16

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

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

Modified Files:
	Makefile.am chix_gaim.c 
Log Message:
fixes and pixmaps

Index: Makefile.am
===================================================================
RCS file: /cvsroot/chix/chix_gaim/src/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	4 Jul 2007 17:52:16 -0000	1.5
+++ Makefile.am	5 Jul 2007 15:13:03 -0000	1.6
@@ -8,6 +8,6 @@
 
 plugin_LTLIBRARIES     = libchixpurple.la
 
-libchixpurple_la_SOURCES = chix_purple.c
+libchixpurple_la_SOURCES = chix_gaim.c
 
 libchixpurple_la_LIBADD  = @chix_libs@

Index: chix_gaim.c
===================================================================
RCS file: /cvsroot/chix/chix_gaim/src/chix_gaim.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- chix_gaim.c	4 Jul 2007 17:52:16 -0000	1.15
+++ chix_gaim.c	5 Jul 2007 15:13:03 -0000	1.16
@@ -267,16 +267,26 @@
     {
 	ChixCredit *credit = (ChixCredit *)node;
 	GList      *row = NULL;
+        
+        row = g_list_append(row, _(credit->provider));
+	row = g_list_append(row, _(credit->alloted));
+	row = g_list_append(row, _(credit->used));
+	row = g_list_append(row, _(credit->left));
 
-	row = g_list_append(row, (gpointer)credit->provider);
-	row = g_list_append(row, (gpointer)credit->alloted);
-	row = g_list_append(row, (gpointer)credit->used);
-	row = g_list_append(row, (gpointer)credit->left);
+        /* 
+         * purple_notify_searchresults() frees these pointers
+         * when we close the dialog box. quick fix for now.
+         */
+        credit->provider = NULL;
+        credit->alloted  = NULL;
+        credit->used = NULL;
+        credit->left = NULL;
 
 	purple_notify_searchresults_row_add(results, row);
     }
     purple_notify_searchresults(client->user_data, _("Available Credits"),
 	                      NULL, NULL, results, NULL, NULL);
+
     chix_event_done(event);
     return 1;
 }
@@ -392,28 +402,29 @@
 }
 
 static void
-cp_tooltip_text(PurpleBuddy *pb, GString *str, gboolean full)
+cp_tooltip_text(PurpleBuddy *pb, PurpleNotifyUserInfo *ui, gboolean full)
 {
     ChixBuddy *buddy;
-    char *stat;
-    char  mood[16];
+    char      *stat;
+    char       mood[16];
 
     if (!pb->proto_data)
     {
-	g_string_append_printf(str, _("\n<b>%s:</b> %s"),
-		                    _("Status"),
-				    _("Buddy not listed"));
-	return;
+	purple_notify_user_info_add_pair(ui,
+                _("Status"), _("Buddy not listed"));
+        return;
     }
 
     buddy = pb->proto_data;
-    chix_buddy_mood_get(buddy, mood, sizeof(mood));
     stat  = __status_text(buddy);
-    g_string_append_printf(str, _("\n<b>%s:</b> %s\n<b>%s:</b> %s\n<b>%s:</b> %s"),
-	                    _("Mood"),     mood,
-			    _("Status"),   stat,
-			    _("Provider"), buddy->provider);
-    g_free(stat);
+
+    if (CHIX_BUDDY_ON_ANY(buddy))
+        purple_notify_user_info_add_pair(ui, _("Status"),   stat);
+    chix_buddy_mood_get(buddy, mood, sizeof(mood));
+    purple_notify_user_info_add_pair(ui, _("Mood"),     mood);
+    purple_notify_user_info_add_pair(ui, _("Provider"), buddy->provider);
+
+    free(stat);
 }
 
 static GList *
@@ -928,7 +939,7 @@
     .icon_spec       = NO_BUDDY_ICONS,
     .list_icon       = cp_list_icon,
 //    .list_emblems    = cp_list_emblems,
-//    .tooltip_text    = cp_tooltip_text,
+    .tooltip_text    = cp_tooltip_text,
     .status_text     = cp_status_text,
     .status_types    = cp_status_types,
     .blist_node_menu = cp_blist_node_menu,
@@ -966,9 +977,6 @@
 {
     PurpleAccountOption *opt;
 
-    printf("FFFFFFFFFFFFFFFFFFFFFUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUCK\n");
-
-
     opt = purple_account_option_bool_new(_("Login as idle"), "idle", FALSE);
     prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, opt);