# HG changeset patch
# User Justin Rodriguez <ffdragon@soc.pidgin.im>
# Date 1219815419 0
# Node ID 1a4417138a8fb3f5c250b3ea3c35533730ef203f
# Parent  9525fb966efb8bba48c00a22e203cf3b44b0d273
clean up formatting, and added render settings for the names/markup on the blist

diff -r 9525fb966efb -r 1a4417138a8f pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Tue Aug 26 08:28:25 2008 +0000
+++ b/pidgin/gtkblist.c	Wed Aug 27 05:36:59 2008 +0000
@@ -5291,7 +5291,7 @@
 		} else if (text == i) {
 			/* name */
 			gtkblist->text_rend = rend = gtk_cell_renderer_text_new();
-			gtk_tree_view_column_pack_start (column, rend, TRUE);
+			gtk_tree_view_column_pack_start(column, rend, TRUE);
 			gtk_tree_view_column_set_attributes(column, rend,
 #if GTK_CHECK_VERSION(2,6,0)
 							    "cell-background-gdk", BGCOLOR_COLUMN,
@@ -5303,6 +5303,7 @@
 			g_signal_connect(G_OBJECT(rend), "editing-canceled", G_CALLBACK(gtk_blist_renderer_editing_cancelled_cb), list);
 #endif
 			g_signal_connect(G_OBJECT(rend), "edited", G_CALLBACK(gtk_blist_renderer_edited_cb), list);
+			g_object_set(rend, "ypad", 0, "yalign", 0.5, NULL);
 #if GTK_CHECK_VERSION(2,6,0)
 			g_object_set(rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 #endif
diff -r 9525fb966efb -r 1a4417138a8f pidgin/gtkicon-theme.c
--- a/pidgin/gtkicon-theme.c	Tue Aug 26 08:28:25 2008 +0000
+++ b/pidgin/gtkicon-theme.c	Wed Aug 27 05:36:59 2008 +0000
@@ -72,6 +72,7 @@
 	priv = PIDGIN_ICON_THEME_GET_PRIVATE(obj);
 	
 	g_hash_table_destroy(priv->icon_files);
+	g_free(priv);
 
 	parent_class->finalize(obj);
 }
diff -r 9525fb966efb -r 1a4417138a8f pidgin/gtkstatus-icon-theme.c
--- a/pidgin/gtkstatus-icon-theme.c	Tue Aug 26 08:28:25 2008 +0000
+++ b/pidgin/gtkstatus-icon-theme.c	Wed Aug 27 05:36:59 2008 +0000
@@ -24,27 +24,22 @@
 #include "gtkstatus-icon-theme.h"
 
 /******************************************************************************
- * Structs
- *****************************************************************************/
-/******************************************************************************
  * Globals
  *****************************************************************************/
 static GObjectClass *parent_class = NULL;
-/******************************************************************************
- * Enums
- *****************************************************************************/
+
 /******************************************************************************
  * GObject Stuff                                                              
  *****************************************************************************/
 
 static void 
-pidgin_status_icon_theme_finalize (GObject *obj)
+pidgin_status_icon_theme_finalize(GObject *obj)
 {
-	parent_class->finalize (obj);
+	parent_class->finalize(obj);
 }
 
 static void
-pidgin_status_icon_theme_class_init (PidginStatusIconThemeClass *klass)
+pidgin_status_icon_theme_class_init(PidginStatusIconThemeClass *klass)
 {
 	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
 
@@ -54,7 +49,7 @@
 }
 
 GType 
-pidgin_status_icon_theme_get_type (void)
+pidgin_status_icon_theme_get_type(void)
 {
   static GType type = 0;
   if (type == 0) {
@@ -70,7 +65,7 @@
       NULL,
       NULL,   /* value table */
     };
-    type = g_type_register_static (PIDGIN_TYPE_ICON_THEME,
+    type = g_type_register_static(PIDGIN_TYPE_ICON_THEME,
                                    "PidginStatusIconTheme",
                                    &info, 0);
   }
diff -r 9525fb966efb -r 1a4417138a8f pidgin/pidginstock.c
--- a/pidgin/pidginstock.c	Tue Aug 26 08:28:25 2008 +0000
+++ b/pidgin/pidginstock.c	Wed Aug 27 05:36:59 2008 +0000
@@ -505,7 +505,7 @@
 	gtk_widget_destroy(win);
 	g_object_unref(G_OBJECT(icon_factory));
 
-	/* Pre-load Status icon theme - this avoids a bug with displaying the correct icon in the tray */
+	/* Pre-load Status icon theme - this avoids a bug with displaying the correct icon in the tray, theme is destroyed after*/
 	if (purple_prefs_get_string(PIDGIN_PREFS_ROOT "/icon/status/theme") && 
 	   (path = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/status/icon-theme-dir"))) {