soc.2008.themes: 2f01a682: clean up formatting, and added render se...

[ffdragon at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 2f01a68221fe705526ece90e1c7438bffc47c3bd
Ancestor: f87d3e3728f76b7782100b61b955bc030cc4e1ae
Author: ffdragon at soc.pidgin.im
Date: 2008-08-27T05:36:59
Branch: im.pidgin.soc.2008.themes
URL: http://d.pidgin.im/viewmtn/revision/info/2f01a68221fe705526ece90e1c7438bffc47c3bd

Modified files:
        pidgin/gtkblist.c pidgin/gtkicon-theme.c
        pidgin/gtkstatus-icon-theme.c pidgin/pidginstock.c

ChangeLog: 

clean up formatting, and added render settings for the names/markup on the blist

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	f2751026048d339a1f4f4aff0e7957f5cc732590
+++ pidgin/gtkblist.c	6b4e301f838d3324211c139655e5d0861130c84c
@@ -5291,7 +5291,7 @@ pidgin_blist_build_layout(PurpleBuddyLis
 		} 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 @@ pidgin_blist_build_layout(PurpleBuddyLis
 			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
============================================================
--- pidgin/gtkicon-theme.c	e3caaa468606d2223bd41140a2f4a5648e84285c
+++ pidgin/gtkicon-theme.c	016d99c5c90ef3f13c09d211c1b479bf0c22b097
@@ -72,6 +72,7 @@ pidgin_icon_theme_finalize(GObject *obj)
 	priv = PIDGIN_ICON_THEME_GET_PRIVATE(obj);
 	
 	g_hash_table_destroy(priv->icon_files);
+	g_free(priv);
 
 	parent_class->finalize(obj);
 }
============================================================
--- pidgin/gtkstatus-icon-theme.c	a61ee9435a41ff239ef646c52d79bc6b71900032
+++ pidgin/gtkstatus-icon-theme.c	706d5d3b76032404665ffb6b78801903b0ee4ac6
@@ -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 
 }
 
 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 @@ pidgin_status_icon_theme_get_type (void)
       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);
   }
============================================================
--- pidgin/pidginstock.c	30ff01ae2582ce4eed25af2bb762f6f5abdb5c6e
+++ pidgin/pidginstock.c	c98cbd2b6331b52f6749dd419c6d38118217229f
@@ -505,7 +505,7 @@ pidgin_stock_init(void)
 	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"))) {