← Back to branch summary

~ubuntu-branches/ubuntu/raring/software-center/raring-proposed

« back to all changes in this revision

Viewing changes to softwarecenter/ui/gtk3/panes/availablepane.py

  • Committer: Package Import Robot
  • Author(s): Michael Vogt
  • Date: 2012-12-06 17:30:50 UTC
  • Revision ID: package-import@ubuntu.com-20121206173050-n7mxi5fzlsvtdh9l
Tags: 5.5.2
* lp:~mvo/software-center/fix-pygobject-deprecation-warnings:
  - fix deprecation warninings with the latest python-gi
* lp:~mvo/software-center/minor-logging-fixes:
  - drop some LOG.info() messages to LOG.debug() to spam the user
    less
* lp:~mvo/software-center/trivial-close-ui-tweak:
  - hide the main window immediately when closing down
* lp:~mvo/software-center/5.4-fix-save-person-to-config:
  - This branch ensures that the "username" is saved everytime
    that the ubuntu sso whoami call is done
* lp:~mvo/software-center/use-dpkg-builddeps:
  - use dpkg-checkbuilddeps to find test-dependencies
* lp:~mvo/software-center/update-sc-cmdline-flexibility:
  - update-software-center-agent: 
    + add --target-db-path commandline
  - update-software-center: 
    + add --app-install-desktop-dir and --target-db-path commandline
* lp:~mvo/software-center/raring-pep8:
  - fixes for new pep8

Show diffs side-by-side

added added

removed removed

Lines of Context:
softwarecenter/ui/gtk3/panes/availablepane.py
19
19
import gettext
20
20
from gi.repository import GObject
21
21
from gi.repository import Gtk
 
22
from gi.repository import GLib
22
23
import logging
23
24
import xapian
24
25
import os
75
76
                 'list',
76
77
                 'details',
77
78
                 'purchase',
78
 
                )
 
79
                 )
79
80
        # actual page id's
80
81
        (LOBBY,
81
82
         SUBCATEGORY,
317
318
        line2 = None
318
319
        if channel is not None:
319
320
            name = channel.display_name or channel.name
320
 
            line1 = GObject.markup_escape_text(name)
 
321
            line1 = GLib.markup_escape_text(name)
321
322
        elif subcategory is not None:
322
 
            line1 = GObject.markup_escape_text(category.name)
323
 
            line2 = GObject.markup_escape_text(subcategory.name)
 
323
            line1 = GLib.markup_escape_text(category.name)
 
324
            line2 = GLib.markup_escape_text(subcategory.name)
324
325
        elif category is not None:
325
 
            line1 = GObject.markup_escape_text(category.name)
 
326
            line1 = GLib.markup_escape_text(category.name)
326
327
        else:
327
328
            line1 = _("All Software")
328
329
        return line1, line2