From 3aa0363a2a2f3be189c3d65a6a39d2a56472ffc9 Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Thu, 21 Jul 2005 21:19:08 +0000
Subject: [PATCH] prefix with roster_

---
 src/common/config.py |  8 ++++----
 src/roster_window.py | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/common/config.py b/src/common/config.py
index 9986a0986..1ce28ee6f 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -90,10 +90,10 @@ class Config:
 		'chat-y-position': [opt_int, 0],
 		'chat-width': [opt_int, 480],
 		'chat-height': [opt_int, 440],
-		'x-position': [ opt_int, 0 ],
-		'y-position': [ opt_int, 0 ],
-		'width': [ opt_int, 150 ],
-		'height': [ opt_int, 400 ],
+		'roster_x-position': [ opt_int, 0 ],
+		'roster_y-position': [ opt_int, 0 ],
+		'roster_width': [ opt_int, 150 ],
+		'roster_height': [ opt_int, 400 ],
 		'latest_disco_addresses': [ opt_str, '' ],
 		'recently_groupchat': [ opt_str, '' ],
 		'before_time': [ opt_str, '[' ],
diff --git a/src/roster_window.py b/src/roster_window.py
index 5de471843..46142a696 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -1505,11 +1505,11 @@ _('If "%s" accepts this request you will know his status.') %jid).get_response()
 		tell that to the core and exit gtk'''
 		if gajim.config.get('saveposition'):
 			x, y = self.window.get_position()
-			gajim.config.set('x-position', x)
-			gajim.config.set('y-position', y)
+			gajim.config.set('roster_x-position', x)
+			gajim.config.set('roster_y-position', y)
 			width, height = self.window.get_size()
-			gajim.config.set('width', width)
-			gajim.config.set('height', height)
+			gajim.config.set('roster_width', width)
+			gajim.config.set('roster_height', height)
 
 		gajim.config.set('collapsed_rows', '\t'.join(self.collapsed_rows))
 		self.plugin.save_config()
@@ -1985,10 +1985,10 @@ _('If "%s" accepts this request you will know his status.') %jid).get_response()
 		# no need of this variable
 		self.have_new_message_accel = False # Is the "Ctrl+N" shown ?
 		if gajim.config.get('saveposition'):
-			self.window.move(gajim.config.get('x-position'),
-				gajim.config.get('y-position'))
-			self.window.resize(gajim.config.get('width'),
-				gajim.config.get('height'))
+			self.window.move(gajim.config.get('roster_x-position'),
+				gajim.config.get('roster_y-position'))
+			self.window.resize(gajim.config.get('roster_width'),
+				gajim.config.get('roster_height'))
 
 		self.popups_notification_height = 0
 		self.popup_notification_windows = []