the regroup accounts feature is now available from preferences window

plugins/gtkgui/config.py

@@ -210,6 +210,13 @@ class preference_Window:
 			self.plugin.config['saveposition'] = 1
 		else:
 			self.plugin.config['saveposition'] = 0
+		#merge groups
+		chk = self.xml.get_widget('merge_checkbutton')
+		if chk.get_active():
+			self.plugin.config['mergeaccounts'] = 1
+		else:
+			self.plugin.config['mergeaccounts'] = 0
+		self.plugin.roster.regroup = self.plugin.config['mergeaccounts']
 		#autopopup
 		if self.chk_autopp.get_active():
 			self.plugin.config['autopopup'] = 1
@@ -390,6 +397,10 @@ class preference_Window:
 		st = self.plugin.config['saveposition']
 		self.xml.get_widget('save_position_checkbutton').set_active(st)
 		
+		#Merge accounts
+		st = self.plugin.config['mergeaccounts']
+		self.xml.get_widget('merge_checkbutton').set_active(st)
+		
 		#Autopopup
 		st = self.plugin.config['autopopup']
 		self.chk_autopp.set_active(st)

plugins/gtkgui/gtkgui.glade

@@ -3508,6 +3508,25 @@ on the server.</property>
 		</packing>
 	      </child>
 
+	      <child>
+		<widget class="GtkCheckButton" id="merge_checkbutton">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Merge accounts</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>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
 	      <child>
 		<widget class="GtkHSeparator" id="hseparator12">
 		  <property name="visible">True</property>

plugins/gtkgui/gtkgui.py

@@ -1879,6 +1879,8 @@ class roster_Window:
 		self.browse_handler_id = 0
 		self.join_handler_id = 0
 		self.regroup = 0
+		if self.plugin.config.has_key('mergeaccounts'):
+			self.regroup = self.plugin.config['mergeaccounts']
 		window = self.xml.get_widget('Gajim')
 		if self.plugin.config.has_key('saveposition'):
 			window.hide()
@@ -2568,6 +2570,7 @@ class plugin:
 			'userbgcolor': '#ffffff',\
 			'userfont': 'Sans 10',\
 			'saveposition': 1,\
+			'mergeaccounts': 0,\
 			'x-position': 0,\
 			'y-position': 0,\
 			'width': 150,\