remove 3 not used modules, ask custom hostname in disco if it exists; add image for sip service
This commit is contained in:
		
							parent
							
								
									951fcfa322
								
							
						
					
					
						commit
						d12146ce7f
					
				
					 2 changed files with 2 additions and 5 deletions
				
			
		
							
								
								
									
										
											BIN
										
									
								
								data/pixmaps/agents/sip.png
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								data/pixmaps/agents/sip.png
									
										
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 1.5 KiB  | 
| 
						 | 
					@ -41,13 +41,9 @@
 | 
				
			||||||
# There are more methods, of course, but this is a basic set.
 | 
					# There are more methods, of course, but this is a basic set.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import os
 | 
					import os
 | 
				
			||||||
import sys
 | 
					 | 
				
			||||||
import gc
 | 
					 | 
				
			||||||
import inspect
 | 
					import inspect
 | 
				
			||||||
import weakref
 | 
					import weakref
 | 
				
			||||||
import time
 | 
					 | 
				
			||||||
import gobject
 | 
					import gobject
 | 
				
			||||||
import pango
 | 
					 | 
				
			||||||
import gtk
 | 
					import gtk
 | 
				
			||||||
import gtk.glade
 | 
					import gtk.glade
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -88,6 +84,7 @@ def _gen_agent_type_info():
 | 
				
			||||||
		('headline', 'weather'):	(False, 'weather.png'),
 | 
							('headline', 'weather'):	(False, 'weather.png'),
 | 
				
			||||||
		('gateway', 'weather'):		(False, 'weather.png'),
 | 
							('gateway', 'weather'):		(False, 'weather.png'),
 | 
				
			||||||
		('_jid', 'weather'):			(False, 'weather.png'),
 | 
							('_jid', 'weather'):			(False, 'weather.png'),
 | 
				
			||||||
 | 
							('gateway', 'sip'):			(False, 'sip.png'),
 | 
				
			||||||
		('directory', 'user'):		(None, 'jud.png'),
 | 
							('directory', 'user'):		(None, 'jud.png'),
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
		# Transports
 | 
							# Transports
 | 
				
			||||||
| 
						 | 
					@ -454,7 +451,7 @@ _('Without a connection, you can not browse available services')).get_response()
 | 
				
			||||||
			self.address_comboboxentry.set_model(liststore)
 | 
								self.address_comboboxentry.set_model(liststore)
 | 
				
			||||||
			self.address_comboboxentry.set_text_column(0)
 | 
								self.address_comboboxentry.set_text_column(0)
 | 
				
			||||||
			self.latest_addresses = gajim.config.get('latest_disco_addresses').split()
 | 
								self.latest_addresses = gajim.config.get('latest_disco_addresses').split()
 | 
				
			||||||
			jid = gajim.config.get_per('accounts', self.account, 'hostname')
 | 
								jid = gajim.get_hostname_from_account(self.account)
 | 
				
			||||||
			if jid in self.latest_addresses:
 | 
								if jid in self.latest_addresses:
 | 
				
			||||||
				self.latest_addresses.remove(jid)
 | 
									self.latest_addresses.remove(jid)
 | 
				
			||||||
			self.latest_addresses.insert(0, jid)
 | 
								self.latest_addresses.insert(0, jid)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue