fix "Unable to load icon gajim" errors caused by !84
This commit is contained in:
		
							parent
							
								
									25f403863e
								
							
						
					
					
						commit
						7e4b257112
					
				
					 5 changed files with 7 additions and 7 deletions
				
			
		| 
						 | 
					@ -3686,7 +3686,7 @@ class AccountCreationWizardWindow:
 | 
				
			||||||
        if self.modify:
 | 
					        if self.modify:
 | 
				
			||||||
            img.set_from_stock(Gtk.STOCK_APPLY, Gtk.IconSize.DIALOG)
 | 
					            img.set_from_stock(Gtk.STOCK_APPLY, Gtk.IconSize.DIALOG)
 | 
				
			||||||
        else:
 | 
					        else:
 | 
				
			||||||
            path_to_file = gtkgui_helpers.get_icon_path('gajim', 48)
 | 
					            path_to_file = gtkgui_helpers.get_icon_path('org.gajim.Gajim', 48)
 | 
				
			||||||
            img.set_from_file(path_to_file)
 | 
					            img.set_from_file(path_to_file)
 | 
				
			||||||
        self.show_vcard_checkbutton.set_active(not self.modify)
 | 
					        self.show_vcard_checkbutton.set_active(not self.modify)
 | 
				
			||||||
        self.notebook.set_current_page(6) # show finish page
 | 
					        self.notebook.set_current_page(6) # show finish page
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1339,7 +1339,7 @@ class AboutDialog(Gtk.AboutDialog):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        self.props.wrap_license = True
 | 
					        self.props.wrap_license = True
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        pixbuf = gtkgui_helpers.get_icon_pixmap('gajim', 128)
 | 
					        pixbuf = gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', 128)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        self.set_logo(pixbuf)
 | 
					        self.set_logo(pixbuf)
 | 
				
			||||||
        #here you write your name in the form Name FamilyName <someone@somewhere>
 | 
					        #here you write your name in the form Name FamilyName <someone@somewhere>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2352,7 +2352,7 @@ class Interface:
 | 
				
			||||||
            status = status + '.png'
 | 
					            status = status + '.png'
 | 
				
			||||||
        elif status == 'online':
 | 
					        elif status == 'online':
 | 
				
			||||||
            prefix = ''
 | 
					            prefix = ''
 | 
				
			||||||
            status = gtkgui_helpers.get_icon_path('gajim', 32)
 | 
					            status = gtkgui_helpers.get_icon_path('org.gajim.Gajim', 32)
 | 
				
			||||||
        path = os.path.join(prefix, status)
 | 
					        path = os.path.join(prefix, status)
 | 
				
			||||||
        try:
 | 
					        try:
 | 
				
			||||||
            obj = bus.get_object('com.google.code.Awn', '/com/google/code/Awn')
 | 
					            obj = bus.get_object('com.google.code.Awn', '/com/google/code/Awn')
 | 
				
			||||||
| 
						 | 
					@ -3040,7 +3040,7 @@ class Interface:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        pixs = []
 | 
					        pixs = []
 | 
				
			||||||
        for size in (16, 32, 48, 64, 128):
 | 
					        for size in (16, 32, 48, 64, 128):
 | 
				
			||||||
            pix = gtkgui_helpers.get_icon_pixmap('gajim', size)
 | 
					            pix = gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', size)
 | 
				
			||||||
            if pix:
 | 
					            if pix:
 | 
				
			||||||
                pixs.append(pix)
 | 
					                pixs.append(pix)
 | 
				
			||||||
        if pixs:
 | 
					        if pixs:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -94,7 +94,7 @@ class HistoryManager:
 | 
				
			||||||
    def __init__(self):
 | 
					    def __init__(self):
 | 
				
			||||||
        pixs = []
 | 
					        pixs = []
 | 
				
			||||||
        for size in (16, 32, 48, 64, 128):
 | 
					        for size in (16, 32, 48, 64, 128):
 | 
				
			||||||
            pix = gtkgui_helpers.get_icon_pixmap('gajim', size)
 | 
					            pix = gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', size)
 | 
				
			||||||
            if pix:
 | 
					            if pix:
 | 
				
			||||||
                pixs.append(pix)
 | 
					                pixs.append(pix)
 | 
				
			||||||
        if pixs:
 | 
					        if pixs:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -321,7 +321,7 @@ class DesktopNotification:
 | 
				
			||||||
            notification_text = ('<html><img src="%(image)s" align=left />' \
 | 
					            notification_text = ('<html><img src="%(image)s" align=left />' \
 | 
				
			||||||
                '%(title)s<br/>%(text)s</html>') % {'title': self.title,
 | 
					                '%(title)s<br/>%(text)s</html>') % {'title': self.title,
 | 
				
			||||||
                'text': self.text, 'image': self.path_to_image}
 | 
					                'text': self.text, 'image': self.path_to_image}
 | 
				
			||||||
            gajim_icon = gtkgui_helpers.get_icon_path('gajim', 48)
 | 
					            gajim_icon = gtkgui_helpers.get_icon_path('org.gajim.Gajim', 48)
 | 
				
			||||||
            try:
 | 
					            try:
 | 
				
			||||||
                self.notif.Notify(
 | 
					                self.notif.Notify(
 | 
				
			||||||
                    dbus.String(_('Gajim')),        # app_name (string)
 | 
					                    dbus.String(_('Gajim')),        # app_name (string)
 | 
				
			||||||
| 
						 | 
					@ -391,7 +391,7 @@ class DesktopNotification:
 | 
				
			||||||
                        '<td>%s</td></tr></table>' % (self.path_to_image,
 | 
					                        '<td>%s</td></tr></table>' % (self.path_to_image,
 | 
				
			||||||
                        text)
 | 
					                        text)
 | 
				
			||||||
                    self.path_to_image = os.path.abspath(
 | 
					                    self.path_to_image = os.path.abspath(
 | 
				
			||||||
                        gtkgui_helpers.get_icon_path('gajim', 48))
 | 
					                        gtkgui_helpers.get_icon_path('org.gajim.Gajim', 48))
 | 
				
			||||||
                actions = ()
 | 
					                actions = ()
 | 
				
			||||||
                if 'actions' in self.capabilities and self.msg_type:
 | 
					                if 'actions' in self.capabilities and self.msg_type:
 | 
				
			||||||
                    actions = (dbus.String('default'), dbus.String(
 | 
					                    actions = (dbus.String('default'), dbus.String(
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue