dcraven status iconset, split to using 16x16 [32x32 not yet] saying bye bye to xpm, and higging glade

src/config.py

@@ -130,7 +130,7 @@ class Preferences_window:
 		self.xml.get_widget('add_remove_emoticons_button').set_sensitive(st)
 
 		#iconset
-		iconsets_list = os.listdir(os.path.join(gajim.DATA_DIR, 'iconsets/'))
+		iconsets_list = os.listdir(os.path.join(gajim.DATA_DIR, 'iconsets'))
 		model = gtk.ListStore(str)
 		self.iconset_combobox.set_model(model)
 		l = []
@@ -423,17 +423,6 @@ class Preferences_window:
 
 	def on_preferences_window_show(self, widget):
 		self.notebook.set_current_page(0)
-		'''
-		theme_combobox = self.xml.get_widget('theme_combobox')
-		model = theme_combobox.get_model()
-		active = theme_combobox.get_active()
-		theme = model[active][0]
-		fonts_colors_table = self.xml.get_widget('fonts_colors_table')
-		if theme == 'custom':
-			fonts_colors_table.show()
-		else:
-			fonts_colors_table.hide()
-		'''
 
 	def on_preferences_window_key_press_event(self, widget, event):
 		if event.keyval == gtk.keysyms.Escape:
@@ -501,8 +490,8 @@ class Preferences_window:
 		self.on_checkbutton_toggled(widget, 'use_transports_iconsets')
 		self.plugin.roster.draw_roster()
 
-	def on_edit_theme_button_clicked(self, widget):
-		GajimThemesWindow(self.plugin)
+	def on_manage_theme_button_clicked(self, widget):
+		dialogs.GajimThemesWindow(self.plugin)
 		
 	
 	def on_roster_widget_color_set(self, widget, text):
@@ -563,29 +552,6 @@ class Preferences_window:
 		model = widget.get_model()
 		active = widget.get_active()
 		theme = model[active][0]
-		'''
-		fonts_colors_table = self.xml.get_widget('fonts_colors_table')
-		if theme == 'custom':
-			fonts_colors_table.show()
-		else:
-			fonts_colors_table.hide()
-		for w in color_widgets:
-			widg = self.xml.get_widget(w)
-			if theme == 'custom':
-				widg.set_color(gtk.gdk.color_parse(gajim.config.get(
-					color_widgets[w])))
-			else:
-				widg.set_color(gtk.gdk.color_parse(self.theme_default[theme]\
-					[color_widgets[w]]))
-				self.on_roster_widget_color_set(widg, color_widgets[w])
-		for w in font_widgets:
-			widg = self.xml.get_widget(w)
-			if theme == 'custom':
-				widg.set_font_name(gajim.config.get(font_widgets[w]))
-			else:
-				widg.set_font_name(self.theme_default[theme][font_widgets[w]])
-				self.on_widget_font_set(widg, font_widgets[w])
-		'''
 				
 		gajim.config.set('roster_theme', theme)
 		# begin repainting themed widgets throughout
@@ -1042,18 +1008,6 @@ class Preferences_window:
 			self.plugin.windows['advanced_config'] = \
 				dialogs.Advanced_configuration_window(self.plugin)
 
-#---------- GajimThemesWindow class -------------#
-class GajimThemesWindow:
-	def on_close_button_clicked(self, widget):
-		self.window.destroy()
-
-	def __init__(self, plugin):
-		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'gajim_themes_window', APP)
-		self.window = self.xml.get_widget('gajim_themes_window')
-		self.plugin = plugin
-		self.xml.signal_autoconnect(self)
-		self.window.show_all()
-
 #---------- Account_modification_window class -------------#
 class Account_modification_window:
 	'''Class for account informations'''

src/dialogs.py

@@ -23,6 +23,7 @@ import gobject
 import os
 
 from vcard import Vcard_window
+from gajim_themes_window import GajimThemesWindow
 from advanced import Advanced_configuration_window
 from gajim import User
 from common import gajim
@@ -421,6 +422,7 @@ class Dialog(gtk.Dialog):
         buttons = self.action_area.get_children()
         return index < len(buttons) and buttons[index] or None
 
+
 class HigDialog(Dialog):
     def __init__(self, parent, pritext, sectext, stockimage, buttons, default = None):
         """GNOME higified version of the Dialog object. Inherit
@@ -503,6 +505,7 @@ class Error_dialog(HigDialog):
             [ [ gtk.STOCK_OK, gtk.RESPONSE_OK ] ]
         )
 
+
 class Subscription_request_window:
 	def __init__(self, plugin, jid, text, account):
 		xml = gtk.glade.XML(GTKGUI_GLADE, 'subscription_request_window', APP)
@@ -719,6 +722,7 @@ _('Without a connection, you can not change your password.')).get_response()
 		self.dialog.destroy()
 		return message
 
+
 class Popup_notification_window:
 	def __init__(self, plugin, event_type, jid, account):
 		self.plugin = plugin

src/gajim_themes_window.py

@@ -0,0 +1,64 @@
+##	dialogs.py
+##
+## Gajim Team:
+##	- Yann Le Boulanger <asterix@lagaule.org>
+##	- Vincent Hanquez <tab@snarc.org>
+##	- Nikos Kouremenos <kourem@gmail.com>
+##
+##	Copyright (C) 2003-2005 Gajim Team
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published
+## by the Free Software Foundation; version 2 only.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+
+import gtk
+import gtk.glade
+
+from common import i18n
+_ = i18n._
+APP = i18n.APP
+gtk.glade.bindtextdomain (APP, i18n.DIR)
+gtk.glade.textdomain (APP)
+
+GTKGUI_GLADE = 'gtkgui.glade'
+
+class GajimThemesWindow:
+	def on_close_button_clicked(self, widget):
+		self.window.destroy()
+
+	def __init__(self, plugin):
+		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'gajim_themes_window', APP)
+		self.window = self.xml.get_widget('gajim_themes_window')
+		self.plugin = plugin
+		self.xml.signal_autoconnect(self)
+		self.window.show_all()
+		
+		'''
+		fonts_colors_table = self.xml.get_widget('fonts_colors_table')
+		if theme == 'custom':
+			fonts_colors_table.show()
+		else:
+			fonts_colors_table.hide()
+		for w in color_widgets:
+			widg = self.xml.get_widget(w)
+			if theme == 'custom':
+				widg.set_color(gtk.gdk.color_parse(gajim.config.get(
+					color_widgets[w])))
+			else:
+				widg.set_color(gtk.gdk.color_parse(self.theme_default[theme]\
+					[color_widgets[w]]))
+				self.on_roster_widget_color_set(widg, color_widgets[w])
+		for w in font_widgets:
+			widg = self.xml.get_widget(w)
+			if theme == 'custom':
+				widg.set_font_name(gajim.config.get(font_widgets[w]))
+			else:
+				widg.set_font_name(self.theme_default[theme][font_widgets[w]])
+				self.on_widget_font_set(widg, font_widgets[w])
+		'''

src/gtkgui.glade

@@ -47,7 +47,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image577">
+			<widget class="GtkImage" id="image649">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-new</property>
 			  <property name="icon_size">1</property>
@@ -67,7 +67,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image578">
+			<widget class="GtkImage" id="image650">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-connect</property>
 			  <property name="icon_size">1</property>
@@ -93,7 +93,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image579">
+			<widget class="GtkImage" id="image651">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-add</property>
 			  <property name="icon_size">1</property>
@@ -113,7 +113,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image580">
+			<widget class="GtkImage" id="image652">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-find</property>
 			  <property name="icon_size">1</property>
@@ -151,7 +151,7 @@
 		      <signal name="activate" handler="on_about_menuitem_activate" last_modification_time="Tue, 01 Mar 2005 22:56:45 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image581">
+			<widget class="GtkImage" id="image653">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-about</property>
 			  <property name="icon_size">1</property>
@@ -179,7 +179,7 @@
 		      <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image582">
+			<widget class="GtkImage" id="image654">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-quit</property>
 			  <property name="icon_size">1</property>
@@ -214,9 +214,30 @@
 		      <accelerator key="A" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image583">
+			<widget class="GtkImage" id="image655">
 			  <property name="visible">True</property>
-			  <property name="stock">gtk-select-color</property>
+			  <property name="stock">gtk-network</property>
+			  <property name="icon_size">1</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkImageMenuItem" id="profile_avatar_menuitem">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Profile, Avatar</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_profile_avatar_activate" last_modification_time="Thu, 09 Jun 2005 22:22:16 GMT"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image656">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-properties</property>
 			  <property name="icon_size">1</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
@@ -242,7 +263,7 @@
 		      <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image584">
+			<widget class="GtkImage" id="image657">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-preferences</property>
 			  <property name="icon_size">1</property>
@@ -1114,7 +1135,7 @@
 			<widget class="GtkCheckButton" id="use_ssl_checkbutton">
 			  <property name="border_width">6</property>
 			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim use TLS encryption by default, if broadcasted by the server, and with this option enabled you disable TLS</property>
+			  <property name="tooltip" translatable="yes">Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default, if broadcasted by the server, and with this option enabled you disable TLS</property>
 			  <property name="can_focus">True</property>
 			  <property name="label" translatable="yes">Use _SSL (legacy)</property>
 			  <property name="use_underline">True</property>
@@ -2862,148 +2883,51 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkHBox" id="hbox2901">
+		<widget class="GtkFrame" id="frame35">
 		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">12</property>
+		  <property name="label_xalign">0</property>
+		  <property name="label_yalign">0.5</property>
+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="label174">
+		    <widget class="GtkAlignment" id="alignment73">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Default _status iconset:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">iconset_combobox</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkComboBox" id="iconset_combobox">
-		      <property name="visible">True</property>
-		      <property name="items" translatable="yes"></property>
-		      <signal name="changed" handler="on_iconset_combobox_changed" last_modification_time="Wed, 30 Mar 2005 12:19:34 GMT"/>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="transports_iconsets_checkbutton">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Use _transports iconsets</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		      <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled" last_modification_time="Wed, 25 May 2005 17:03:55 GMT"/>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox2956">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">12</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label249">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Gajim theme:</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkComboBox" id="theme_combobox">
-		      <property name="visible">True</property>
-		      <signal name="changed" handler="on_theme_combobox_changed" last_modification_time="Fri, 29 Apr 2005 11:44:52 GMT"/>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="edit_theme_button">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="on_edit_theme_button_clicked" last_modification_time="Wed, 08 Jun 2005 22:39:39 GMT"/>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">12</property>
+		      <property name="right_padding">0</property>
 
 		      <child>
-			<widget class="GtkAlignment" id="alignment73">
+			<widget class="GtkVBox" id="vbox95">
 			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">0</property>
-			  <property name="yscale">0</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkHBox" id="hbox2970">
+			    <widget class="GtkHBox" id="hbox2901">
 			      <property name="visible">True</property>
 			      <property name="homogeneous">False</property>
-			      <property name="spacing">2</property>
+			      <property name="spacing">12</property>
 
 			      <child>
-				<widget class="GtkImage" id="image613">
+				<widget class="GtkLabel" id="label174">
 				  <property name="visible">True</property>
-				  <property name="stock">gtk-select-color</property>
-				  <property name="icon_size">4</property>
+				  <property name="label" translatable="yes">Default _status iconset:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
 				  <property name="xalign">0.5</property>
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">iconset_combobox</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -3013,10 +2937,57 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkLabel" id="label326">
+				<widget class="GtkComboBox" id="iconset_combobox">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Edit...</property>
+				  <property name="items" translatable="yes"></property>
+				  <signal name="changed" handler="on_iconset_combobox_changed" last_modification_time="Wed, 30 Mar 2005 12:19:34 GMT"/>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkCheckButton" id="transports_iconsets_checkbutton">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Use _transports iconsets</property>
 				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="active">False</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				  <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled" last_modification_time="Wed, 25 May 2005 17:03:55 GMT"/>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkHBox" id="hbox2956">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">12</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label249">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Gajim theme:</property>
+				  <property name="use_underline">False</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
 				  <property name="wrap">False</property>
@@ -3032,20 +3003,68 @@
 				  <property name="fill">False</property>
 				</packing>
 			      </child>
+
+			      <child>
+				<widget class="GtkComboBox" id="theme_combobox">
+				  <property name="visible">True</property>
+				  <signal name="changed" handler="on_theme_combobox_changed" last_modification_time="Fri, 29 Apr 2005 11:44:52 GMT"/>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkButton" id="manage_theme_button">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Manage...</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <signal name="clicked" handler="on_manage_theme_button_clicked" last_modification_time="Thu, 09 Jun 2005 22:15:40 GMT"/>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
 			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
 			  </child>
 			</widget>
 		      </child>
 		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkLabel" id="label326">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Interface Customization&lt;/b&gt;</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		    </widget>
 		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
+		      <property name="type">label_item</property>
 		    </packing>
 		  </child>
 		</widget>
 		<packing>
-		  <property name="padding">0</property>
+		  <property name="padding">12</property>
 		  <property name="expand">False</property>
 		  <property name="fill">True</property>
 		</packing>
@@ -3161,6 +3180,7 @@
 
 		  <child>
 		    <widget class="GtkAlignment" id="alignment53">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
@@ -3173,7 +3193,6 @@
 
 		      <child>
 			<widget class="GtkVBox" id="vbox62">
-			  <property name="border_width">6</property>
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">12</property>
@@ -3807,6 +3826,7 @@
 
 		  <child>
 		    <widget class="GtkAlignment" id="alignment58">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
@@ -4110,6 +4130,7 @@
 
 		  <child>
 		    <widget class="GtkAlignment" id="alignment55">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
@@ -4122,7 +4143,6 @@
 
 		      <child>
 			<widget class="GtkVBox" id="vbox65">
-			  <property name="border_width">6</property>
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">6</property>
@@ -4667,6 +4687,7 @@
 
 		  <child>
 		    <widget class="GtkAlignment" id="alignment49">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
@@ -4679,7 +4700,6 @@
 
 		      <child>
 			<widget class="GtkVBox" id="vbox56">
-			  <property name="border_width">6</property>
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">6</property>
@@ -4905,6 +4925,7 @@
 
 		  <child>
 		    <widget class="GtkAlignment" id="alignment42">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
@@ -4923,7 +4944,6 @@
 
 			  <child>
 			    <widget class="GtkHBox" id="hbox2918">
-			      <property name="border_width">3</property>
 			      <property name="visible">True</property>
 			      <property name="homogeneous">False</property>
 			      <property name="spacing">6</property>
@@ -4981,6 +5001,7 @@ Custom</property>
 
 			      <child>
 				<widget class="GtkAlignment" id="alignment43">
+				  <property name="border_width">6</property>
 				  <property name="visible">True</property>
 				  <property name="xalign">0.5</property>
 				  <property name="yalign">0.5</property>
@@ -4993,7 +5014,6 @@ Custom</property>
 
 				  <child>
 				    <widget class="GtkTable" id="table22">
-				      <property name="border_width">3</property>
 				      <property name="visible">True</property>
 				      <property name="n_rows">2</property>
 				      <property name="n_columns">2</property>
@@ -5164,6 +5184,7 @@ Custom</property>
 
 		  <child>
 		    <widget class="GtkAlignment" id="alignment41">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
@@ -5176,7 +5197,6 @@ Custom</property>
 
 		      <child>
 			<widget class="GtkVBox" id="vbox48">
-			  <property name="border_width">5</property>
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">6</property>
@@ -5260,6 +5280,7 @@ Custom</property>
 
 		  <child>
 		    <widget class="GtkAlignment" id="alignment56">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
@@ -5272,7 +5293,6 @@ Custom</property>
 
 		      <child>
 			<widget class="GtkVBox" id="vbox66">
-			  <property name="border_width">6</property>
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">6</property>
@@ -5375,6 +5395,7 @@ Custom</property>
 
 		  <child>
 		    <widget class="GtkAlignment" id="alignment64">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
@@ -5387,7 +5408,6 @@ Custom</property>
 
 		      <child>
 			<widget class="GtkButton" id="open_advanced_editor_button">
-			  <property name="border_width">6</property>
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>

src/roster_window.py

@@ -316,11 +316,13 @@ class Roster_window:
 			for account in gajim.connections:
 				our_jid = gajim.config.get_per('accounts', account, 'name') + '@' +\
 					gajim.config.get_per('accounts', account, 'hostname')
-				lbl = gtk.Label()
-				lbl.set_markup('<b>abc</b>')
-				item = gtk.MenuItem()
-				item.add(lbl)
-				#item = gtk.MenuItem(_('as ') + our_jid)
+				
+				#FIXME: delmonico hack here
+				#lbl = gtk.Label()
+				#lbl.set_markup('<b>' + _('abc') +'</b>')
+				#item = gtk.MenuItem()
+				#item.add(lbl)
+				
 				item = gtk.MenuItem(_('as ') + our_jid)
 				sub_menu.append(item)
 				item.connect('activate', self.on_join_gc_activate, account)
@@ -1293,7 +1295,6 @@ class Roster_window:
 			files = []
 			files.append(path + state_file + '.gif')
 			files.append(path + state_file + '.png')
-			files.append(path + state_file + '.xpm')
 			image = gtk.Image()
 			image.show()
 			imgs[state] = image
@@ -1308,7 +1309,7 @@ class Roster_window:
 		iconset = gajim.config.get('iconset')
 		if not iconset:
 			iconset = 'sun'
-		self.path = os.path.join(gajim.DATA_DIR, 'iconsets/' + iconset + '/')
+		self.path = os.path.join(gajim.DATA_DIR, 'iconsets/' + iconset + '/16x16/')
 		self.jabber_state_images = self.load_iconset(self.path)
 
 	def reload_jabber_state_images(self):
@@ -1591,7 +1592,7 @@ class Roster_window:
 				continue
 			folder = os.path.join(path, transport)
 			self.transports_state_images[transport] = self.load_iconset(folder + \
-				'/')
+				'/16x16/')
 
 		liststore = gtk.ListStore(gobject.TYPE_STRING, gtk.Image, 
 			gobject.TYPE_STRING)