pidgin3: comparison src/buddy.c

-:a511c4575a0e
+:97bcee8f5d43
 {
 	GtkStyle *style;
 	GdkPixbuf *pixbuf = gaim_gtk_blist_get_status_icon(b, GAIM_STATUS_ICON_LARGE);
 	PangoLayout *layout;
 	char *tooltiptext = gaim_get_tooltip_text(b);
-	int width;
 	layout = gtk_widget_create_pango_layout (gtkblist->tipwindow, NULL);
 	pango_layout_set_markup(layout, tooltiptext, strlen(tooltiptext));
 	pango_layout_set_wrap(layout, PANGO_WRAP_WORD);
 	pango_layout_set_width(layout, 300000);
 			       b->alias && b->alias[0] ? "\n" : "", b->alias && b->alias[0] ? _("<b>Alias:</b> ") : "", b->alias ? b->alias : "",
 			       b->server_alias ? "\n" : "", b->server_alias ? _("<b>Nickname:</b> ") : "", b->server_alias ? b->server_alias : "",
 			       b->idle ? "\n" : "", b->idle ? idletime : "",
 			       b->evil ? "\n" : "", b->evil ? warning : "",
 			       statustext ? "\n" : "", statustext ? statustext : "");
+	if(warning)
+		g_free(warning);
+	if(idletime)
+		g_free(idletime);
+	if(statustext)
+		g_free(statustext);
 	return text;
 }
 static GdkPixbuf *gaim_gtk_blist_get_status_icon(struct buddy *b, GaimStatusIconSize size)
 {
 	GdkPixbuf *status = NULL;
 	GdkPixbuf *scale = NULL;
 	GdkPixbuf *emblem = NULL;
 	gchar *filename = NULL;
 	const char *protoname = NULL;
 	char *se = NULL, *sw = NULL ,*nw = NULL ,*ne = NULL;
 	int scalesize = 30;
 	struct prpl* prpl = find_prpl(b->account->protocol);
 	if (prpl->list_icon)
 		protoname = prpl->list_icon(b->account, b);
 	if (prpl->list_emblems)
 		prpl->list_emblems(b, &se, &sw, &nw, &ne);
 	if (size == GAIM_STATUS_ICON_SMALL) {
 		scalesize = 15;
 		sw = nw = ne = NULL; /* So that only the se icon will composite */
 	}
 		g_free(filename);
 		gtknode = GAIM_GTK_BLIST_NODE((GaimBlistNode*)b);
 		gtknode->timer = g_timeout_add(10000, (GSourceFunc)gaim_reset_present_icon, b);
 		/* "Hey, what's all this crap?" you ask.  Status icons will be themeable too, and
 		   then it will look up protoname from the theme */
 	} else {
 		char *image = g_strdup_printf("%s.png", protoname);
 		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
 		status = gdk_pixbuf_new_from_file(filename,NULL);
 		g_free(image);
 		g_free(filename);
 	}
 	if (!status)
 		return NULL;
 	scale =  gdk_pixbuf_scale_simple(status, scalesize, scalesize, GDK_INTERP_BILINEAR);
+	g_object_unref(G_OBJECT(status));
 	/* Emblems */
 	/* Each protocol can specify up to four "emblems" to composite over the base icon.  "away", "busy", "mobile user"
 	 * are all examples of states represented by emblems.  I'm not even really sure I like this yet. */
 	/* XXX Clean this crap up, yo. */
 	if (se) {
 		char *image = g_strdup_printf("%s.png", se);
 		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
 		g_free(image);
 						      15, 15,
 						      0, 0,
 						      1, 1,
 						      GDK_INTERP_BILINEAR,
 						      255);
+			g_object_unref(G_OBJECT(emblem));
 		}
 	}
 	if (sw) {
 		char *image = g_strdup_printf("%s.png", sw);
 		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
 		g_free(image);
 		emblem = gdk_pixbuf_new_from_file(filename,NULL);
 		g_free(filename);
 		if (emblem) {
-				gdk_pixbuf_composite (emblem,
+			gdk_pixbuf_composite (emblem,
-						      scale, 0, 15,
+					scale, 0, 15,
-						      15, 15,
+					15, 15,
-						      0, 15,
+					0, 15,
-						      1, 1,
+					1, 1,
-						      GDK_INTERP_BILINEAR,
+					GDK_INTERP_BILINEAR,
-						      255);
+					255);
+			g_object_unref(G_OBJECT(emblem));
 		}
 	}
 	if (nw) {
 		char *image = g_strdup_printf("%s.png", nw);
 		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
 					      15, 15,
 					      0, 0,
 					      1, 1,
 					      GDK_INTERP_BILINEAR,
 					      255);
+			g_object_unref(G_OBJECT(emblem));
 		}
 	}
 	if (ne) {
 		char *image = g_strdup_printf("%s.png", ne);
 		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
 					      15, 0,
 					      1, 1,
 					      GDK_INTERP_BILINEAR,
 					      255);
 		}
 	}
 	/* Idle grey buddies affects the whole row.  This converts the status icon to greyscale. */
 	if (b->idle && blist_options & OPT_BLIST_GREY_IDLERS)
 		gdk_pixbuf_saturate_and_pixelate(scale, scale, 0, FALSE);
 	return scale;
 }
 static GdkPixbuf *gaim_gtk_blist_get_buddy_icon(struct buddy *b)
 {
 	/* This just opens a file from ~/.gaim/icons/screenname.  This needs to change to be more gooder. */
-	char *file = g_build_filename(gaim_user_dir(), "icons", normalize(b->name), NULL);
+	char *file;
-	GdkPixbuf *buf = gdk_pixbuf_new_from_file(file, NULL);
+	GdkPixbuf *buf, *ret;
 	if (!(blist_options & OPT_BLIST_SHOW_ICONS))
 		return NULL;
+	file = g_build_filename(gaim_user_dir(), "icons", normalize(b->name), NULL);
+	buf = gdk_pixbuf_new_from_file(file, NULL);
+	g_free(file);
 	if (buf) {
 		if (b->idle && blist_options & OPT_BLIST_GREY_IDLERS) {
 			gdk_pixbuf_saturate_and_pixelate(buf, buf, 0, FALSE);
 		}
-		return gdk_pixbuf_scale_simple(buf,30,30, GDK_INTERP_BILINEAR);
+		ret = gdk_pixbuf_scale_simple(buf,30,30, GDK_INTERP_BILINEAR);
+		g_object_unref(G_OBJECT(buf));
+		return ret;
 	}
 	return NULL;
 }
 static gchar *gaim_gtk_blist_get_name_markup(struct buddy *b)
 		g_free(idletime);
 	if (warning)
 		g_free(warning);
 	if (statustext)
 		g_free(statustext);
+	if (esc)
+		g_free(esc);
 	return text;
 }
 /**********************************************************************************
 							   STATUS_ICON_COLUMN, gtk_widget_render_icon
 							   (gtkblist->treeview,GTK_STOCK_OPEN,GTK_ICON_SIZE_SMALL_TOOLBAR,NULL),
 							   NAME_COLUMN, mark,
 							   NODE_COLUMN, node->parent,
 							   -1);
+					g_free(mark);
 					expand = TRUE;
 				}
 				oldersibling = node->prev;

Mercurial > pidgin3 / file comparison

comparison: src/buddy.c

src/buddy.c