File iceWMCP-3.2-deprecated.patch of Package iceWMCP

--- ICEWMCP_BugReport.py
+++ ICEWMCP_BugReport.py
@@ -214,7 +214,7 @@
         table1.attach(Label(_("To")+":"), 0, 1, 0, 1, (GTK.FILL), (0), 0, 0)
         table1.attach(Label(_("From")+":"), 0, 1, 1, 2, (GTK.FILL), (0), 0, 0)
         table1.attach(Label(_("SMTP Server")+":"), 0, 1, 2, 3, (GTK.FILL), (0), 0, 0)
-        table1.attach(Label("<"+BUG_REPORT_ADDRESS.replace(" [at] ","@")+">"), 1, 2, 0, 1, (GTK.EXPAND+GTK.FILL), (0), 0, 0)
+        table1.attach(Label("<"+BUG_REPORT_ADDRESS.replace(" [at] ","@")+">"), 1, 2, 0, 1, (GTK.EXPAND|GTK.FILL), (0), 0, 0)
         sserver=Entry()
         sfrom=Entry()
         table1.attach(sfrom, 1, 2, 1, 2, (GTK.EXPAND+GTK.FILL), (0), 0, 0)
--- IceMe.py
+++ IceMe.py
@@ -201,14 +201,14 @@
 
         table = Table(2, 6, FALSE)
         table.attach(name_label,         0, 1, 0, 1, 0)
-        table.attach(self.name_entry,          1, 2, 0, 1, (EXPAND+FILL))
+        table.attach(self.name_entry,          1, 2, 0, 1, (EXPAND|FILL))
         table.attach(self.command_label, 0, 1, 1, 2, 0)
-        table.attach(command_hbox,       1, 2, 1, 2, (EXPAND+FILL))
+        table.attach(command_hbox,       1, 2, 1, 2, (EXPAND|FILL))
         table.attach(icon_label,         0, 1, 2, 3, 0)
-        table.attach(icon_hbox,          1, 2, 2, 3, (EXPAND+FILL))
-        table.attach(sep,                0, 2, 3, 4, (EXPAND+FILL))
-        table.attach(self.is_restart,    1, 2, 4, 5, (EXPAND+FILL))
-        table.attach(self.add_shortcut,  1, 2, 5, 6, (EXPAND+FILL))
+        table.attach(icon_hbox,          1, 2, 2, 3, (EXPAND|FILL))
+        table.attach(sep,                0, 2, 3, 4, (EXPAND|FILL))
+        table.attach(self.is_restart,    1, 2, 4, 5, (EXPAND|FILL))
+        table.attach(self.add_shortcut,  1, 2, 5, 6, (EXPAND|FILL))
         table.set_border_width(10)
         table.set_row_spacings(5)
         table.set_col_spacings(5)
@@ -456,7 +456,7 @@
         selbutton1.connect("clicked", self.menu_sel_file_box)
 	selbutton1.set_data("myentry",menentry)
 	menubox.pack_start(selbutton1, 0,0,0)
-        table.attach(menubox,  1, 2, 0, 1, (EXPAND+FILL))
+        table.attach(menubox,  1, 2, 0, 1, (EXPAND|FILL))
 
         table.attach(Label(_("Programs")+":"), 0, 1, 1, 2, 0)
 	menubox=HBox(0,0)
@@ -470,7 +470,7 @@
         selbutton1.connect("clicked", self.menu_sel_file_box)
 	selbutton1.set_data("myentry",menentry)
 	menubox.pack_start(selbutton1, 0,0,0)
-        table.attach(menubox, 1, 2, 1, 2, (EXPAND+FILL))
+        table.attach(menubox, 1, 2, 1, 2, (EXPAND|FILL))
 
         table.attach(Label(_("Toolbar")+":"),  0, 1, 2, 3, 0)
 	menubox=HBox(0,0)
@@ -484,7 +484,7 @@
         selbutton1.connect("clicked", self.menu_sel_file_box)
 	selbutton1.set_data("myentry",menentry)
 	menubox.pack_start(selbutton1, 0,0,0)
-        table.attach(menubox,  1, 2, 2, 3, (EXPAND+FILL))
+        table.attach(menubox,  1, 2, 2, 3, (EXPAND|FILL))
         table.set_row_spacings(3)
         table.set_col_spacings(3)
 
--- IceWMCPWallpaper.py
+++ IceWMCPWallpaper.py
@@ -238,20 +238,20 @@
 	self.cutoff2=267
 	sclay.set_size_request( self.cutoff1,self.cutoff2)
 	# top row
-	prevtable.attach( Label(""), 0, 1, 0, 1, (EXPAND+FILL), (0), 0, 0)
+	prevtable.attach( Label(""), 0, 1, 0, 1, (EXPAND|FILL), (0), 0, 0)
 
 	try:
 		prevtable.attach( loadScaledImage(getPixDir()+"monitor_top1.png",411,22), 1, 2, 0, 1, (), (0), 0, 0)
 	except:
-		prevtable.attach( Label(""), 1, 2, 0, 1, (EXPAND+FILL), (0), 0, 0)
+		prevtable.attach( Label(""), 1, 2, 0, 1, (EXPAND|FILL), (0), 0, 0)
 
-	prevtable.attach( Label(""), 2, 3, 0, 1, (EXPAND+FILL), (0), 0, 0)
+	prevtable.attach( Label(""), 2, 3, 0, 1, (EXPAND|FILL), (0), 0, 0)
 
 	# middle row
 	middlebox=HBox(0,0)
-	prevtable.attach( Label(""), 0, 1, 1, 2, (EXPAND+FILL), (0), 0, 0)
-	prevtable.attach( middlebox, 1, 2, 1, 2, (EXPAND+FILL), (0), 0, 0)
-	prevtable.attach( Label(""), 2, 3, 1, 2, (EXPAND+FILL), (0), 0, 0)
+	prevtable.attach( Label(""), 0, 1, 1, 2, (EXPAND|FILL), (0), 0, 0)
+	prevtable.attach( middlebox, 1, 2, 1, 2, (EXPAND|FILL), (0), 0, 0)
+	prevtable.attach( Label(""), 2, 3, 1, 2, (EXPAND|FILL), (0), 0, 0)
 	try:
 		middlebox.pack_start( loadScaledImage(getPixDir()+"monitor_left1.png",27,268), 0, 0, 0)
 	except:
@@ -269,12 +269,12 @@
 
 
 	# bottom row
-	prevtable.attach( Label(""), 0, 1, 2, 3, (EXPAND+FILL), (0), 0, 0)
+	prevtable.attach( Label(""), 0, 1, 2, 3, (EXPAND|FILL), (0), 0, 0)
 	try:
 		prevtable.attach( loadScaledImage(getPixDir()+"monitor_bottom1.png",411,29), 1, 2, 2, 3, (), (0), 0, 0)
 	except:
-		prevtable.attach( Label(""), 1, 2, 2, 3, (EXPAND+FILL), (0), 0, 0)
-	prevtable.attach( Label(""), 2, 3, 2, 3, (EXPAND+FILL), (0), 0, 0)
+		prevtable.attach( Label(""), 1, 2, 2, 3, (EXPAND|FILL), (0), 0, 0)
+	prevtable.attach( Label(""), 2, 3, 2, 3, (EXPAND|FILL), (0), 0, 0)
 
 
 	prevtabbox.pack_start(prevtable,0,0,0)
--- icesound.py
+++ icesound.py
@@ -321,8 +321,8 @@
 	self.event_entry  = event_entry 
 	global last_to
 	last_to=None
-	eventtable.attach( eventcombo, 0, 1, 1, 2, (EXPAND+FILL), (0), 9, 0)
-	eventtable.attach( selsoundtext, 1, 2, 1, 2, (EXPAND+FILL), (0), 0, 0)
+	eventtable.attach( eventcombo, 0, 1, 1, 2, (EXPAND|FILL), (0), 9, 0)
+	eventtable.attach( selsoundtext, 1, 2, 1, 2, (EXPAND|FILL), (0), 0, 0)
 	selsoundbutt = getPixmapButton(icewindow, STOCK_CDROM,_("Change..."))
         selsoundbutt.connect("clicked",changeSound)
 	tips.set_tip (selsoundbutt, _("Select a sound for this event"))
@@ -499,10 +499,10 @@
 	self.table1 = table1
 	playtext = Entry ()
 	self.playtext = playtext
-	table1.attach(playtext, 1, 2, 0, 1, (EXPAND+FILL), (0), 0, 0)
+	table1.attach(playtext, 1, 2, 0, 1, (EXPAND|FILL), (0), 0, 0)
 	edittext = Entry ()
 	self.edittext = edittext
-	table1.attach(edittext, 1, 2, 1, 2, (EXPAND+FILL), (0), 0, 0)
+	table1.attach(edittext, 1, 2, 1, 2, (EXPAND|FILL), (0), 0, 0)
 	playerlab = Label (_("Wav Player Command Line"))
 	playerlab.set_alignment ( 0, 0.5)
 	self.playerlab = playerlab
@@ -531,16 +531,16 @@
 	autocheck.set_active (1)
 	tips.set_tip (autocheck,_("Automatically start IceSound server when Ice Sound Manager starts"))
 	self.autocheck = autocheck
-	table2.attach ( autocheck, 0, 1, 0, 1, (EXPAND+FILL), (0), 4, 0)
+	table2.attach ( autocheck, 0, 1, 0, 1, (EXPAND|FILL), (0), 4, 0)
 	copycheck = CheckButton(_("Copy files instead of linking them"))
 	tips.set_tip (copycheck,_("Copy files instead of linking them"))
 	self.copycheck = copycheck
-	table2.attach ( copycheck, 0, 1, 1, 2, (EXPAND+FILL), (0), 4, 0)
+	table2.attach ( copycheck, 0, 1, 1, 2, (EXPAND|FILL), (0), 4, 0)
 	stdouttext = CheckButton(_("Launch the IceSound Server in a terminal window"))
 	stdouttext.set_active ( 1)
 	tips.set_tip (stdouttext,_("Launch the IceSound Server in a terminal window"))
 	self.stdouttext = stdouttext
-	table2.attach ( stdouttext, 0, 1, 2, 3, (EXPAND+FILL), (0), 4, 0)
+	table2.attach ( stdouttext, 0, 1, 2, 3, (EXPAND|FILL), (0), 4, 0)
 	what4 = getPixmapButton(iceoptions,STOCK_DIALOG_INFO,WHATS_THIS)
 	tips.set_tip (what4,CLICK_HELP)
 	self.what4 = what4
@@ -1481,17 +1481,17 @@
         oss.connect("clicked",doAudioToggle,1)
 	tips.set_tip (oss, _("Select to use the OSS audio interface"))
 	self.oss = oss
-	table1.attach(oss, 0, 1, 0, 1, (EXPAND+FILL), (0), 0, 0)
+	table1.attach(oss, 0, 1, 0, 1, (EXPAND|FILL), (0), 0, 0)
 	esd = RadioButton (self.oss, "ESD")
 	tips.set_tip (esd, _("Select to use the ESD audio interface"))
         esd.connect("clicked",doAudioToggle,2)
 	self.esd = esd
-	table1.attach(esd, 1, 2, 0, 1, (EXPAND+FILL), (0), 0, 0)
+	table1.attach(esd, 1, 2, 0, 1, (EXPAND|FILL), (0), 0, 0)
 	yiff =RadioButton (self.oss, "YIFF")
 	tips.set_tip (yiff, _("Select to use the YIFF audio interface"))
         yiff.connect("clicked",doAudioToggle,3)
 	self.yiff = yiff
-	table1.attach(yiff, 2, 3, 0, 1, (EXPAND+FILL), (0), 0, 0)
+	table1.attach(yiff, 2, 3, 0, 1, (EXPAND|FILL), (0), 0, 0)
 	label1 = Label (_("Device"))
 	label1.set_alignment ( 0, 0.5)
 	self.label1 = label1
@@ -1507,15 +1507,15 @@
 	devtext = Entry ()
 	tips.set_tip (devtext, _("Enter the Digital Signal Processing  DSP  to use"))
 	self.devtext = devtext
-	table1.attach(devtext, 0, 1, 2, 3, (EXPAND+FILL), (0), 0, 0)
+	table1.attach(devtext, 0, 1, 2, 3, (EXPAND|FILL), (0), 0, 0)
 	host1text = Entry ()
 	tips.set_tip (host1text, _("Enter the host of the ESD server"))
 	self.host1text = host1text
-	table1.attach(host1text, 1, 2, 2, 3, (EXPAND+FILL), (0), 0, 0)
+	table1.attach(host1text, 1, 2, 2, 3, (EXPAND|FILL), (0), 0, 0)
 	host2text = Entry ()
 	tips.set_tip (host2text, _("Enter the host of the YIFF server"))
 	self.host2text = host2text
-	table1.attach(host2text, 2, 3, 2, 3, (EXPAND+FILL), (0), 0, 0)
+	table1.attach(host2text, 2, 3, 2, 3, (EXPAND|FILL), (0), 0, 0)
 	label4 = Label (_("Port"))
 	label4.set_alignment ( 0, 0.5)
 	self.label4 = label4
@@ -1527,7 +1527,7 @@
 	port1text = Entry ()
 	tips.set_tip (port1text, _("Enter the port number of the ESD server"))
 	self.port1text = port1text
-	table1.attach(port1text, 1, 2, 4, 5, (EXPAND+FILL), (0), 0, 0)
+	table1.attach(port1text, 1, 2, 4, 5, (EXPAND|FILL), (0), 0, 0)
 
 	localcheck = CheckButton(_("Local Interface"))
 	tips.set_tip (localcheck, _("If checked  the local (non-TCP) ESD server will be used. The 'Host' and 'Port' will be ignored, since it is not needed if this option is checked."))
@@ -1537,7 +1537,7 @@
 	port2text = Entry ()
 	tips.set_tip (port2text, _("Enter the port number of the YIFF server"))
 	self.port2text = port2text
-	table1.attach(port2text, 2, 3, 4, 5, (EXPAND+FILL), (0), 0, 0)
+	table1.attach(port2text, 2, 3, 4, 5, (EXPAND|FILL), (0), 0, 0)
 	autocheck = CheckButton(_("Auto Audio Mode"))
 	tips.set_tip (autocheck, _("If checked  the YIFF server will attempt to automatically adjust to the correct audio mode"))
 	self.autocheck = autocheck
--- pyspool.py
+++ pyspool.py
@@ -145,23 +145,23 @@
 	desc_text=Entry()
 	self.desc_text=desc_text
 	desc_text.set_editable(0)
-	mytable.attach(desc_text,1,2,0,1,(EXPAND+FILL),(0),0,0)
+	mytable.attach(desc_text,1,2,0,1,(EXPAND|FILL),(0),0,0)
 	q_text=Entry()
 	self.q_text=q_text
 	q_text.set_editable(0)
-	mytable.attach(q_text,1,2,1,2,(EXPAND+FILL),(0),0,0)
+	mytable.attach(q_text,1,2,1,2,(EXPAND|FILL),(0),0,0)
 	server_text=Entry()
 	self.server_text=server_text
 	server_text.set_editable(0)
-	mytable.attach(server_text,1,2,2,3,(EXPAND+FILL),(0),0,0)
+	mytable.attach(server_text,1,2,2,3,(EXPAND|FILL),(0),0,0)
 	status_text=Entry()
 	self.status_text=status_text
 	status_text.set_editable(0)
-	mytable.attach(status_text,1,2,3,4,(EXPAND+FILL),(0),0,0)
+	mytable.attach(status_text,1,2,3,4,(EXPAND|FILL),(0),0,0)
 	info_text=Entry()
 	info_text.set_editable(0)
 	self.info_text=info_text
-	mytable.attach(info_text,1,2,4,5,(EXPAND+FILL),(0),0,0)
+	mytable.attach(info_text,1,2,4,5,(EXPAND|FILL),(0),0,0)
 	hbox3.pack_start( mytable,1,1,0)
 	vbox3=VBox(1,7)
 	self.vbox3=vbox3