rpms/system-config-printer
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove unused patches

Browse Source
This commit is contained in:
Jiri Popelka 2013-07-12 15:58:03 +02:00
parent aad68a33e4
commit a503622c14
3 changed files with 0 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
system-config-printer-DISPLAY.patch
View File

@ -1,36 +0,0 @@
diff -up system-config-printer-1.4.0/applet.py.DISPLAY system-config-printer-1.4.0/applet.py
--- system-config-printer-1.4.0/applet.py.DISPLAY 2013-03-27 12:19:07.000000000 +0000
+++ system-config-printer-1.4.0/applet.py 2013-04-11 15:33:03.102010436 +0100
@@ -1,6 +1,6 @@
#!/usr/bin/python
-## Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Red Hat, Inc.
+## Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Red Hat, Inc.
## Author: Tim Waugh <twaugh@redhat.com>
## This program is free software; you can redistribute it and/or modify
@@ -41,12 +41,7 @@ except locale.Error, e:
os.environ['LC_ALL'] = 'C'
locale.setlocale (locale.LC_ALL, "")
-try:
- from gi.repository import Notify
-except RuntimeError, e:
- print "%s:" % DOMAIN, e
- print "This is a graphical application and requires DISPLAY to be set."
- sys.exit (1)
+from gi.repository import Notify
APPDIR="/usr/share/system-config-printer"
ICON="printer"
diff -up system-config-printer-1.4.0/system-config-printer.py.DISPLAY system-config-printer-1.4.0/system-config-printer.py
--- system-config-printer-1.4.0/system-config-printer.py.DISPLAY 2013-03-27 12:19:08.000000000 +0000
+++ system-config-printer-1.4.0/system-config-printer.py 2013-04-11 15:33:03.103010439 +0100
@@ -31,6 +31,7 @@ from gi.repository import GdkPixbuf
try:
from gi.repository import Gdk
from gi.repository import Gtk
+ Gtk.init (sys.argv)
except RuntimeError, e:
print "system-config-printer:", e
print "This is a graphical application and requires DISPLAY to be set."

129
system-config-printer-encoding.patch
View File

@ -1,129 +0,0 @@
diff -up system-config-printer-1.4.0/system-config-printer.py.encoding system-config-printer-1.4.0/system-config-printer.py
--- system-config-printer-1.4.0/system-config-printer.py.encoding 2013-04-11 15:34:21.424342230 +0100
+++ system-config-printer-1.4.0/system-config-printer.py 2013-04-11 15:34:42.001429400 +0100
@@ -460,7 +460,7 @@ class GUI(GtkGUI):
model = self.dests_iconview.get_model ()
iter = model.get_iter_first ()
while iter != None:
- name = unicode (model.get_value (iter, 2))
+ name = model.get_value (iter, 2).decode ('utf-8')
if name == queue:
path = model.get_path (iter)
self.dests_iconview.scroll_to_path (path, True, 0.5, 0.5)
@@ -499,7 +499,7 @@ class GUI(GtkGUI):
def dests_iconview_item_activated (self, iconview, path):
model = iconview.get_model ()
iter = model.get_iter (path)
- name = unicode (model.get_value (iter, 2))
+ name = model.get_value (iter, 2).decode ('utf-8')
object = model.get_value (iter, 0)
self.desensitise_main_window_widgets ()
@@ -538,7 +538,7 @@ class GUI(GtkGUI):
for path in paths:
iter = model.get_iter (path)
object = model.get_value (iter, 0)
- name = unicode (model.get_value (iter, 2))
+ name = model.get_value (iter, 2).decode ('utf-8')
if object.discovered:
any_discovered = True
if object.enabled:
@@ -958,7 +958,7 @@ class GUI(GtkGUI):
# Restore selection of printers.
model = self.dests_iconview.get_model ()
def maybe_select (model, path, iter, UNUSED):
- name = unicode (model.get_value (iter, 2))
+ name = model.get_value (iter, 2).decode ('utf-8')
if name in selected_printers:
self.dests_iconview.select_path (path)
model.foreach (maybe_select, None)
@@ -1286,7 +1286,7 @@ class GUI(GtkGUI):
model = self.dests_iconview.get_model ()
iter = model.get_iter (path)
- name = unicode (model.get_value (iter, 2))
+ name = model.get_value (iter, 2).decode ('utf-8')
if not self.is_rename_possible (name):
return
if not self.rename_confirmed_by_user (name):
@@ -1320,7 +1320,7 @@ class GUI(GtkGUI):
def printer_name_edited (self, cell, path, newname):
model = self.dests_iconview.get_model ()
iter = model.get_iter (path)
- name = unicode (model.get_value (iter, 2))
+ name = model.get_value (iter, 2).decode ('utf-8')
debugprint ("edited: %s -> %s" % (name, newname))
try:
self.rename_printer (name, newname)
@@ -1439,7 +1439,7 @@ class GUI(GtkGUI):
# ..and select the new printer.
def select_new_printer (model, path, iter):
- name = unicode (model.get_value (iter, 2))
+ name = model.get_value (iter, 2).decode ('utf-8')
if name == new_name:
self.dests_iconview.select_path (path)
self.populateList ()
@@ -1463,7 +1463,7 @@ class GUI(GtkGUI):
paths = iconview.get_selected_items ()
model = self.dests_iconview.get_model ()
iter = model.get_iter (paths[0])
- name = unicode (model.get_value (iter, 2))
+ name = model.get_value (iter, 2).decode ('utf-8')
self.entDuplicateName.set_text(name)
self.NewPrinterName.set_transient_for (self.PrintersWindow)
result = self.NewPrinterName.run()
@@ -1513,7 +1513,7 @@ class GUI(GtkGUI):
if n == 1:
itr = model.get_iter (paths[0])
obj = model.get_value (itr, 0)
- name = unicode (model.get_value (itr, 2), 'utf-8')
+ name = model.get_value (itr, 2).decode ('utf-8')
if obj.is_class:
message_format = _("Really delete class '%s'?") % name
else:
@@ -1524,7 +1524,7 @@ class GUI(GtkGUI):
message_format = _("Really delete selected destinations?")
for path in paths:
itr = model.get_iter (path)
- name = unicode (model.get_value (itr, 2), 'utf-8')
+ name = model.get_value (itr, 2).decode ('utf-8')
to_delete.append (name)
dialog = Gtk.MessageDialog(self.PrintersWindow,
@@ -1652,7 +1652,7 @@ class GUI(GtkGUI):
paths = iconview.get_selected_items ()
model = iconview.get_model ()
iter = model.get_iter (paths[0])
- name = unicode (model.get_value (iter, 2))
+ name = model.get_value (iter, 2).decode ('utf-8')
self.set_system_or_user_default_printer (name)
def on_edit_activate (self, *UNUSED):
@@ -1665,7 +1665,7 @@ class GUI(GtkGUI):
model = self.dests_iconview.get_model ()
for path in paths:
iter = model.get_iter (path)
- name = unicode (model.get_value (iter, 2), 'utf-8')
+ name = model.get_value (iter, 2).decode ('utf-8')
class_members.append (name)
if not self.newPrinterGUI.init ("class",
host=self.connect_server,
@@ -1692,7 +1692,7 @@ class GUI(GtkGUI):
model = self.dests_iconview.get_model ()
for path in paths:
iter = model.get_iter (path)
- name = unicode (model.get_value (iter, 2), 'utf-8')
+ name = model.get_value (iter, 2).decode ('utf-8')
specific_dests.append (name)
viewer = jobviewer.JobViewer (None, None, my_jobs=False,
specific_dests=specific_dests,
@@ -1822,7 +1822,7 @@ class GUI(GtkGUI):
model = self.dests_iconview.get_model ()
iter = model.get_iter_first ()
while iter != None:
- queue = unicode (model.get_value (iter, 2))
+ queue = model.get_value (iter, 2).decode ('utf-8')
if queue == name:
path = model.get_path (iter)
self.dests_iconview.scroll_to_path (path, True, 0.5, 0.5)

17
system-config-printer-quit.patch
View File

@ -1,17 +0,0 @@
diff -up system-config-printer-1.4.0/system-config-printer.py.quit system-config-printer-1.4.0/system-config-printer.py
--- system-config-printer-1.4.0/system-config-printer.py.quit 2013-04-12 12:05:58.441494614 +0100
+++ system-config-printer-1.4.0/system-config-printer.py 2013-04-12 12:06:05.500559576 +0100
@@ -1230,11 +1230,11 @@ class GUI(GtkGUI):
while len (self.jobviewers) > 0:
# this will call on_jobviewer_exit
self.jobviewers[0].on_delete_event ()
- del self.mainlist
- del self.printers
self.propertiesDlg.destroy ()
self.newPrinterGUI.destroy ()
Gtk.main_quit()
+ del self.mainlist
+ del self.printers
# Rename
def is_rename_possible (self, name):