Comment 15 for bug 7550

Message-ID: <email address hidden>
Date: Thu, 7 Oct 2004 16:18:41 -0500
From: Branden Robinson <email address hidden>
To: <email address hidden>
Subject: [<email address hidden>: Dexlet diff for configlet 2]

----- Forwarded message from Jeff Licquia <email address hidden> -----

From: <email address hidden> (Jeff Licquia)
To: <email address hidden>
Subject: Dexlet diff for configlet 2
Date: Thu, 7 Oct 2004 16:00:19 -0500 (EST)
Message-Id: <20041007210019.8C2E83F643@zorak>

Here's the diff I found:

--- xfree86-4.2.1/debian/local/dexlet/main.py 2003-08-15 12:13:53.000000000 -0500
+++ xfree86-4.2.1-dexlet/debian/local/dexlet/main.py 2003-08-15 12:11:55.000000000 -0500
@@ -1,7 +1,9 @@
 # $Progeny: main.py,v 1.44 2002/01/18 06:19:46 dsp Exp $

-# Copyright (C) 2000, 2001 Progeny Linux Systems, Inc.
-# Authors: Branden Robinson; Jeff Licquia; Eric Gillespie, Jr.
+# $Id$
+
+# Copyright (C) 2000, 2001, 2003 Progeny Linux Systems, Inc.
+# Authors: Branden Robinson; Jeff Licquia; Eric Gillespie
 #
 # This is free software; you may redistribute it and/or modify
 # it under the terms of the GNU General Public License as
@@ -353,7 +355,7 @@

 def get_optionmenu_index(optionmenu):
     menu = optionmenu.get_menu()
- children = menu.children()
+ children = menu.get_children()
     item = menu.get_active()
     for i in range(len(children)):
         if children[i] == item:
@@ -419,9 +421,9 @@
     else:
         configlet.warn("dexlet", "impossible value of selected_mouse_port; \"%s\"" % (selected_mouse_port,))
     mouse_protocols = new_protocol_list
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
     for item in mouse_protocols:
- menuitem = gtk.GtkMenuItem(item)
+ menuitem = gtk.MenuItem(item)
         menuitem.show()
         newmenu.append(menuitem)
     newmenu.show()
@@ -463,25 +465,25 @@
     w = my_wtree.get_widget("monitor_simple_dialog")
     w.show()
     w.grab_focus()
- w.get_window()._raise()
+ #w.get_window()._raise()

 def raise_monitor_medium_dialog(*args):
     w = my_wtree.get_widget("monitor_medium_dialog")
     w.show()
     w.grab_focus()
- w.get_window()._raise()
+ #w.get_window()._raise()

 def raise_monitor_advanced_dialog(*args):
     w = my_wtree.get_widget("monitor_advanced_dialog")
     w.show()
     w.grab_focus()
- w.get_window()._raise()
+ #w.get_window()._raise()

 def raise_videocard_advanced_dialog(*args):
     w = my_wtree.get_widget("videocard_advanced_dialog")
     w.show()
     w.grab_focus()
- w.get_window()._raise()
+ #w.get_window()._raise()

 def freq_ok(freq):
     # returns 0 if input invalid, 1 if valid
@@ -573,9 +575,13 @@
     this_widget.hide()

 def raise_32bits_dialog(*args):
- dialog = gnome_ui.GnomeMessageBox("32-bit color is actually 24 bits of color information plus\n8 bits of alpha channel or simple zero padding. The X Window\nSystem can handle both kinds of data, so select the 24 bit\nsetting if you need either alpha channel or zero padding.", "info", gnome_ui.STOCK_BUTTON_OK)
+ box_text = "32-bit color is actually 24 bits of color information plus\n8 bits of alpha channel or simple zero padding. The X Window\nSystem can handle both kinds of data, so select the 24 bit\nsetting if you need either alpha channel or zero padding."
+
+ dialog = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO, gtk.BUTTONS_CLOSE,
+ box_text)
     dialog.set_position(gtk.WIN_POS_CENTER)
- clue_them_in = dialog.run_and_close()
+ dialog.run()
+ dialog.destroy()

 class Dexlet(configlet.Configlet):
     def append_debconf(self, name, value):
@@ -620,18 +626,18 @@
         # initialize the option menus

         # color depth
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
         for item in color_depths_keys:
- menuitem = gtk.GtkMenuItem(item)
+ menuitem = gtk.MenuItem(item)
             menuitem.show()
             newmenu.append(menuitem)
         newmenu.show()
         my_wtree.get_widget("default_depth").set_menu(newmenu)

         # bpp
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
         for item in bpp_choices:
- menuitem = gtk.GtkMenuItem(item)
+ menuitem = gtk.MenuItem(item)
             menuitem.show()
             newmenu.append(menuitem)
         newmenu.show()
@@ -639,9 +645,9 @@

         # X server driver list
         # TODO: populate this using arch_driver_map
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
         for item in card_drivers_keys:
- menuitem = gtk.GtkMenuItem(item)
+ menuitem = gtk.MenuItem(item)
             menuitem.show()
             newmenu.append(menuitem)
         newmenu.show()
@@ -652,9 +658,9 @@
         #temp_list = dpkg_output.readlines()
         #temp_list.sort()
         server_list = map(string.strip, available_xservers)
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
         for item in server_list:
- menuitem = gtk.GtkMenuItem(item)
+ menuitem = gtk.MenuItem(item)
             menuitem.show()
             menuitem.connect("activate", select_xserver, item)
             newmenu.append(menuitem)
@@ -664,20 +670,20 @@
             my_wtree.get_widget("default_xserver").set_sensitive(FALSE)

         # allowed users
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
         for item in allowed_users_choices_keys:
- menuitem = gtk.GtkMenuItem(item)
+ menuitem = gtk.MenuItem(item)
             menuitem.show()
             newmenu.append(menuitem)
         newmenu.show()
         my_wtree.get_widget("allowed_users").set_menu(newmenu)

         # screen size
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
         for item in screen_size_freqs_keys:
- label = gtk.GtkLabel(item)
+ label = gtk.Label(item)
             label.show()
- menuitem = gtk.GtkMenuItem()
+ menuitem = gtk.MenuItem()
             menuitem.add(label)
             menuitem.show()
             newmenu.append(menuitem)
@@ -685,9 +691,9 @@
         my_wtree.get_widget("screen_size").set_menu(newmenu)

         # mode list
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
         for item in mode_list_freqs_keys:
- menuitem = gtk.GtkMenuItem(item)
+ menuitem = gtk.MenuItem(item)
             menuitem.show()
             newmenu.append(menuitem)
         newmenu.show()
@@ -856,9 +862,9 @@
                     mouse_ports = mouse_ports_devfs
                 else:
                     mouse_ports = mouse_ports_traditional
- newmenu = gtk.GtkMenu()
+ newmenu = gtk.Menu()
                 for item in mouse_ports:
- menuitem = gtk.GtkMenuItem(item)
+ menuitem = gtk.MenuItem(item)
                     menuitem.show()
                     menuitem.connect("activate", select_mouse_port, item)
                     newmenu.append(menuitem)
@@ -1056,12 +1062,17 @@

         # now set the questions that will cause the changes to take effect in
         # the real config files
- for template in [ "shared/clobber_x-server_symlink",
- configspace + "/manage_config_with_debconf",
- configspace + "/move_existing_nondebconf_config",
- "xserver-common/manage_config_with_debconf",
- "xserver-common/move_existing_nondebconf_config" ]:
- self.append_debconf(template, "true")
+ # XXX: This style of configuration file management has been nuked as of
+ # 4.2.1-10, but the xfree86v3 packages haven't been updated yet. When
+ # it has, its X server packages should delcare a conflict with
+ # xserver-common (<< 4.2.1-10), and the following block of code can be
+ # deleted. Don't forget the occurrence of
+ # shared/clobber_x-server_symlink in dexlet_attributes.
+ if configspace == "shared/xfree86v3":
+ for template in [ "shared/clobber_x-server_symlink",
+ configspace + "/manage_config_with_debconf",
+ configspace + "/move_existing_nondebconf_config" ]:
+ self.append_debconf(template, "true")

     def report_debconf(self):
         return self.debconf_data

----- End forwarded message -----

--
Branden Robinson | GPG signed/encrypted mail welcome
<email address hidden> | 1024D/9C0BCBFB
Progeny Linux Systems | D5F6 D4C9 E25B 3D37 068C
                          | 72E8 0F42 191A 9C0B CBFB