leave vcard_window into dialogs namespace to not bloat null namespace
rename of the vcard_information_window file to something saner
This commit is contained in:
		
							parent
							
								
									b7c2fdc662
								
							
						
					
					
						commit
						c0ea210834
					
				
					 5 changed files with 8 additions and 9 deletions
				
			
		| 
						 | 
				
			
			@ -29,7 +29,6 @@ from gajim import User
 | 
			
		|||
import cell_renderer_image
 | 
			
		||||
from common import gajim
 | 
			
		||||
from common import connection
 | 
			
		||||
from vcard_information_window import Vcard_information_window
 | 
			
		||||
from common import i18n
 | 
			
		||||
 | 
			
		||||
_ = i18n._
 | 
			
		||||
| 
						 | 
				
			
			@ -1145,7 +1144,8 @@ class Account_modification_window:
 | 
			
		|||
			return
 | 
			
		||||
		if not self.plugin.windows[self.account]['infos'].has_key('vcard'):
 | 
			
		||||
			self.plugin.windows[self.account]['infos'][jid] = \
 | 
			
		||||
				Vcard_information_window(jid, self.plugin, self.account, True)
 | 
			
		||||
				dialogs.Vcard_window(jid, self.plugin,
 | 
			
		||||
						self.account, True)
 | 
			
		||||
			gajim.connections[self.account].request_vcard(jid)
 | 
			
		||||
	
 | 
			
		||||
	def on_gpg_choose_button_clicked(self, widget, data = None):
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,6 +23,7 @@ import gobject
 | 
			
		|||
from gajim import User
 | 
			
		||||
from common import gajim
 | 
			
		||||
from common import i18n
 | 
			
		||||
from vcard import Vcard_window
 | 
			
		||||
_ = i18n._
 | 
			
		||||
APP = i18n.APP
 | 
			
		||||
gtk.glade.bindtextdomain (APP, i18n.DIR)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -26,7 +26,6 @@ import dialogs
 | 
			
		|||
import chat
 | 
			
		||||
import cell_renderer_image
 | 
			
		||||
from common import gajim
 | 
			
		||||
from vcard_information_window import Vcard_information_window
 | 
			
		||||
from common import i18n
 | 
			
		||||
 | 
			
		||||
_ = i18n._
 | 
			
		||||
| 
						 | 
				
			
			@ -375,8 +374,8 @@ class Groupchat_window(chat.Chat):
 | 
			
		|||
		"""Call vcard_information_window class to display user's information"""
 | 
			
		||||
		if not self.plugin.windows[self.account]['infos'].has_key(jid):
 | 
			
		||||
			self.plugin.windows[self.account]['infos'][jid] = \
 | 
			
		||||
				Vcard_information_window(jid, self.plugin, self.account, \
 | 
			
		||||
					True)
 | 
			
		||||
				dialogs.Vcard_window(jid, self.plugin,
 | 
			
		||||
						self.account, True)
 | 
			
		||||
			gajim.connections[self.account].request_vcard(jid)
 | 
			
		||||
			#FIXME: maybe use roster.on_info above?
 | 
			
		||||
			
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -35,7 +35,6 @@ import cell_renderer_image
 | 
			
		|||
 | 
			
		||||
from gajim import User
 | 
			
		||||
from common import gajim
 | 
			
		||||
from vcard_information_window import Vcard_information_window
 | 
			
		||||
from common import i18n
 | 
			
		||||
 | 
			
		||||
_ = i18n._
 | 
			
		||||
| 
						 | 
				
			
			@ -393,8 +392,8 @@ class Roster_window:
 | 
			
		|||
		if info.has_key(user.jid):
 | 
			
		||||
			info[user.jid].window.present()
 | 
			
		||||
		else:
 | 
			
		||||
			info[user.jid] = Vcard_information_window(user,
 | 
			
		||||
							self.plugin, account)
 | 
			
		||||
			info[user.jid] = dialogs.Vcard_window(user, self.plugin,
 | 
			
		||||
								account)
 | 
			
		||||
 | 
			
		||||
	def on_agent_logging(self, widget, jid, state, account):
 | 
			
		||||
		'''When an agent is requested to log in or off'''
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -28,7 +28,7 @@ gtk.glade.textdomain (APP)
 | 
			
		|||
 | 
			
		||||
GTKGUI_GLADE = 'gtkgui.glade'
 | 
			
		||||
 | 
			
		||||
class Vcard_information_window:
 | 
			
		||||
class Vcard_window:
 | 
			
		||||
	'''Class for user's information window'''
 | 
			
		||||
	def on_user_information_window_destroy(self, widget = None):
 | 
			
		||||
		'''close window'''
 | 
			
		||||
		Loading…
	
	Add table
		
		Reference in a new issue