Date: Tuesday August 15, 2000 @ 17:42 Author: cameron Update of /home/netrek/cvsroot/Vanilla/gum In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv7753/gum Modified Files: gum.xml main.c support.c support.h Log Message: Fixed typo for DOOSHER. Add SBPLANETS to gum, along with Glade upgrade to version 0.5.9. **************************************** Index: Vanilla/gum/gum.xml diff -u Vanilla/gum/gum.xml:1.8 Vanilla/gum/gum.xml:1.9 --- Vanilla/gum/gum.xml:1.8 Thu Dec 30 00:39:57 1999 +++ Vanilla/gum/gum.xml Tue Aug 15 17:42:45 2000 @@ -10,18 +10,11 @@ <language>C</language> <gnome_support>False</gnome_support> <gettext_support>False</gettext_support> - <use_widget_names>False</use_widget_names> <output_main_file>False</output_main_file> - <output_support_files>True</output_support_files> - <output_build_files>True</output_build_files> - <backup_source_files>True</backup_source_files> <main_source_file>main.c</main_source_file> <main_header_file>main.h</main_header_file> <handler_source_file>signals.c</handler_source_file> <handler_header_file>signals.h</handler_header_file> - <support_source_file>support.c</support_source_file> - <support_header_file>support.h</support_header_file> - <translatable_strings_file></translatable_strings_file> </project> <widget> @@ -35,6 +28,7 @@ <title>Netrek Server</title> <type>GTK_WINDOW_TOPLEVEL</type> <position>GTK_WIN_POS_NONE</position> + <modal>False</modal> <allow_shrink>True</allow_shrink> <allow_grow>True</allow_grow> <auto_shrink>False</auto_shrink> @@ -50,6 +44,7 @@ <widget> <class>GtkMenuBar</class> <name>menubar</name> + <shadow_type>GTK_SHADOW_OUT</shadow_type> <child> <padding>0</padding> <expand>True</expand> @@ -177,11 +172,6 @@ <class>GtkNotebook</class> <name>notebook1</name> <border_width>10</border_width> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> <can_focus>True</can_focus> <show_tabs>True</show_tabs> <show_border>True</show_border> @@ -190,7 +180,11 @@ <tab_hborder>2</tab_hborder> <tab_vborder>2</tab_vborder> <popup_enable>False</popup_enable> - <num_pages>12</num_pages> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> <widget> <class>GtkVBox</class> @@ -201,11 +195,6 @@ <widget> <class>GtkLabel</class> <name>label140</name> - <child> - <padding>6</padding> - <expand>False</expand> - <fill>True</fill> - </child> <label>Listener Port List</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -213,17 +202,17 @@ <yalign>1</yalign> <xpad>0</xpad> <ypad>0</ypad> + <child> + <padding>6</padding> + <expand>False</expand> + <fill>True</fill> + </child> </widget> <widget> <class>GtkCList</class> <name>listener_port_list</name> <border_width>9</border_width> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> <signal> <name>select_row</name> <handler>on_listener_port_list_select_row</handler> @@ -239,6 +228,11 @@ <selection_mode>GTK_SELECTION_SINGLE</selection_mode> <show_titles>True</show_titles> <shadow_type>GTK_SHADOW_IN</shadow_type> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> <widget> <class>GtkLabel</class> @@ -335,20 +329,27 @@ <widget> <class>GtkTable</class> <name>table14</name> - <child> - <padding>6</padding> - <expand>False</expand> - <fill>True</fill> - </child> <rows>4</rows> <columns>3</columns> <homogeneous>False</homogeneous> <row_spacing>0</row_spacing> <column_spacing>0</column_spacing> + <child> + <padding>6</padding> + <expand>False</expand> + <fill>True</fill> + </child> <widget> <class>GtkLabel</class> <name>label1354</name> + <label>Port: </label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -363,18 +364,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Port: </label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1356</name> + <label>Process Name: </label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1356</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -389,18 +390,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Process Name: </label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1357</name> + <label>Arguments: </label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1357</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -415,18 +416,21 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Arguments: </label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkEntry</class> <name>listener_entry_port</name> + <can_focus>True</can_focus> + <signal> + <name>changed</name> + <handler>on_listener_entry_port_changed</handler> + <last_modification_time>Wed, 10 Feb 1999 12:57:52 GMT</last_modification_time> + </signal> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>6</text_max_length> + <text></text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -441,21 +445,21 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkEntry</class> + <name>listener_entry_program</name> <can_focus>True</can_focus> <signal> <name>changed</name> - <handler>on_listener_entry_port_changed</handler> - <last_modification_time>Wed, 10 Feb 1999 12:57:52 GMT</last_modification_time> + <handler>on_listener_entry_program_changed</handler> + <last_modification_time>Wed, 10 Feb 1999 12:58:01 GMT</last_modification_time> </signal> <editable>True</editable> <text_visible>True</text_visible> - <text_max_length>6</text_max_length> + <text_max_length>0</text_max_length> <text></text> - </widget> - - <widget> - <class>GtkEntry</class> - <name>listener_entry_program</name> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -470,21 +474,21 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkEntry</class> + <name>listener_entry_process</name> <can_focus>True</can_focus> <signal> <name>changed</name> - <handler>on_listener_entry_program_changed</handler> - <last_modification_time>Wed, 10 Feb 1999 12:58:01 GMT</last_modification_time> + <handler>on_listener_entry_process_changed</handler> + <last_modification_time>Wed, 10 Feb 1999 12:58:10 GMT</last_modification_time> </signal> <editable>True</editable> <text_visible>True</text_visible> <text_max_length>0</text_max_length> <text></text> - </widget> - - <widget> - <class>GtkEntry</class> - <name>listener_entry_process</name> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -499,21 +503,21 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkEntry</class> + <name>listener_entry_arguments</name> <can_focus>True</can_focus> <signal> <name>changed</name> - <handler>on_listener_entry_process_changed</handler> - <last_modification_time>Wed, 10 Feb 1999 12:58:10 GMT</last_modification_time> + <handler>on_listener_entry_arguments_changed</handler> + <last_modification_time>Wed, 10 Feb 1999 12:58:21 GMT</last_modification_time> </signal> <editable>True</editable> <text_visible>True</text_visible> <text_max_length>0</text_max_length> <text></text> - </widget> - - <widget> - <class>GtkEntry</class> - <name>listener_entry_arguments</name> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -528,21 +532,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <signal> - <name>changed</name> - <handler>on_listener_entry_arguments_changed</handler> - <last_modification_time>Wed, 10 Feb 1999 12:58:21 GMT</last_modification_time> - </signal> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> </widget> <widget> <class>GtkLabel</class> <name>label1355</name> + <label>File Name: </label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -557,18 +558,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>File Name: </label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>label1358</name> + <label>(TCP/IP port number to accept connections on)</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>2</left_attach> <right_attach>3</right_attach> @@ -583,18 +584,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>(TCP/IP port number to accept connections on)</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1359</name> + <label>(Program to exec() on connection arrival)</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1359</name> <child> <left_attach>2</left_attach> <right_attach>3</right_attach> @@ -609,18 +610,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>(Program to exec() on connection arrival)</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1360</name> + <label>(Process name to show on "ps")</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1360</name> <child> <left_attach>2</left_attach> <right_attach>3</right_attach> @@ -635,18 +636,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>(Process name to show on "ps")</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1361</name> + <label>(Additional program arguments, e.g. queue number)</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1361</name> <child> <left_attach>2</left_attach> <right_attach>3</right_attach> @@ -661,13 +662,6 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>(Additional program arguments, e.g. queue number)</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> </widget> @@ -675,17 +669,17 @@ <class>GtkHButtonBox</class> <name>hbuttonbox4</name> <border_width>6</border_width> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - </child> <layout_style>GTK_BUTTONBOX_END</layout_style> <spacing>30</spacing> <child_min_width>85</child_min_width> <child_min_height>27</child_min_height> <child_ipad_x>7</child_ipad_x> <child_ipad_y>0</child_ipad_y> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>True</fill> + </child> <widget> <class>GtkButton</class> @@ -756,11 +750,6 @@ <widget> <class>GtkLabel</class> <name>label139</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - </child> <label>Listener Process Commands</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -768,28 +757,28 @@ <yalign>1</yalign> <xpad>0</xpad> <ypad>0</ypad> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>True</fill> + </child> </widget> <widget> <class>GtkHBox</class> <name>hbox54</name> <border_width>6</border_width> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <padding>0</padding> <expand>False</expand> <fill>True</fill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkLabel</class> <name>label141</name> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> <label>Caution: Remember the players.</label> <justify>GTK_JUSTIFY_LEFT</justify> @@ -798,22 +787,27 @@ <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkHButtonBox</class> - <name>hbuttonbox3</name> <child> <padding>0</padding> <expand>True</expand> <fill>True</fill> </child> + </widget> + + <widget> + <class>GtkHButtonBox</class> + <name>hbuttonbox3</name> <layout_style>GTK_BUTTONBOX_END</layout_style> <spacing>30</spacing> <child_min_width>85</child_min_width> <child_min_height>27</child_min_height> <child_ipad_x>7</child_ipad_x> <child_ipad_y>0</child_ipad_y> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> <widget> <class>GtkButton</class> @@ -895,11 +889,6 @@ <widget> <class>GtkLabel</class> <name>label1363</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - </child> <label>Metaserver List</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -907,16 +896,16 @@ <yalign>1</yalign> <xpad>0</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkCList</class> - <name>metaserver_list</name> <child> <padding>0</padding> - <expand>True</expand> + <expand>False</expand> <fill>True</fill> </child> + </widget> + + <widget> + <class>GtkCList</class> + <name>metaserver_list</name> <tooltip>The list of metaservers that your server will send solicitation messages to in order to have players turn up.</tooltip> <signal> <name>select_row</name> @@ -933,6 +922,11 @@ <selection_mode>GTK_SELECTION_SINGLE</selection_mode> <show_titles>True</show_titles> <shadow_type>GTK_SHADOW_IN</shadow_type> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> <widget> <class>GtkLabel</class> @@ -1064,20 +1058,27 @@ <widget> <class>GtkTable</class> <name>table15</name> - <child> - <padding>10</padding> - <expand>False</expand> - <fill>True</fill> - </child> <rows>9</rows> <columns>3</columns> <homogeneous>False</homogeneous> <row_spacing>0</row_spacing> <column_spacing>0</column_spacing> + <child> + <padding>10</padding> + <expand>False</expand> + <fill>True</fill> + </child> <widget> <class>GtkLabel</class> <name>label1373</name> + <label>Metaserver Host Name: </label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -1092,18 +1093,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Metaserver Host Name: </label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1374</name> + <label>Metaserver Port Number: </label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1374</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -1118,18 +1119,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Metaserver Port Number: </label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1375</name> + <label>Minimum Update Time: </label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1375</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -1144,18 +1145,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Minimum Update Time: </label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1376</name> + <label>Maximum Update Time: </label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1376</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -1170,18 +1171,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Maximum Update Time: </label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1377</name> + <label>Server Host Name: </label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1377</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -1196,18 +1197,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Server Host Name: </label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1378</name> + <label>Server Type: </label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1378</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -1222,18 +1223,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Server Type: </label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1379</name> + <label>Player Port: </label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1379</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -1248,18 +1249,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Player Port: </label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1380</name> + <label>Observer Port: </label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1380</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -1274,18 +1275,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Observer Port: </label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1381</name> + <label>Additional Comments: </label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1381</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -1300,18 +1301,22 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Additional Comments: </label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkEntry</class> <name>metaserver_entry_port_number</name> + <tooltip>The port number at the metaserver that your server is to send the solicitation messages to. The default port is 3521, and should not be changed unless the metaserver administrator says so. Choosing the wrong port will simply delist your server.</tooltip> + <can_focus>True</can_focus> + <signal> + <name>changed</name> + <handler>on_metaserver_changed</handler> + <last_modification_time>Thu, 27 May 1999 01:00:10 GMT</last_modification_time> + </signal> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -1326,22 +1331,22 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <tooltip>The port number at the metaserver that your server is to send the solicitation messages to. The default port is 3521, and should not be changed unless the metaserver administrator says so. Choosing the wrong port will simply delist your server.</tooltip> + </widget> + + <widget> + <class>GtkEntry</class> + <name>metaserver_entry_minimum_update_time</name> + <tooltip>The minimum update interval in seconds. The code forces this to a minimum of 60, because if you reduce it below 60 the metaserver will delist your server for flooding. Come on, once a minute is probably enough, eh?</tooltip> <can_focus>True</can_focus> <signal> <name>changed</name> <handler>on_metaserver_changed</handler> - <last_modification_time>Thu, 27 May 1999 01:00:10 GMT</last_modification_time> + <last_modification_time>Thu, 27 May 1999 01:00:24 GMT</last_modification_time> </signal> <editable>True</editable> <text_visible>True</text_visible> <text_max_length>0</text_max_length> <text></text> - </widget> - - <widget> - <class>GtkEntry</class> - <name>metaserver_entry_minimum_update_time</name> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -1356,22 +1361,22 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <tooltip>The minimum update interval in seconds. The code forces this to a minimum of 60, because if you reduce it below 60 the metaserver will delist your server for flooding. Come on, once a minute is probably enough, eh?</tooltip> + </widget> + + <widget> + <class>GtkEntry</class> + <name>metaserver_entry_server_host_name</name> + <tooltip>The DNS host name of your server. This may well be different to the server host name, especially if you are using DNS aliases. This is the address that clients will connect to.</tooltip> <can_focus>True</can_focus> <signal> <name>changed</name> <handler>on_metaserver_changed</handler> - <last_modification_time>Thu, 27 May 1999 01:00:24 GMT</last_modification_time> + <last_modification_time>Thu, 27 May 1999 01:00:54 GMT</last_modification_time> </signal> <editable>True</editable> <text_visible>True</text_visible> <text_max_length>0</text_max_length> <text></text> - </widget> - - <widget> - <class>GtkEntry</class> - <name>metaserver_entry_server_host_name</name> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -1386,22 +1391,22 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <tooltip>The DNS host name of your server. This may well be different to the server host name, especially if you are using DNS aliases. This is the address that clients will connect to.</tooltip> + </widget> + + <widget> + <class>GtkEntry</class> + <name>metaserver_entry_player_port</name> + <tooltip>The port number to which players should connect. The default is 2592. If you have multiple servers on your machine, you may have to change this for one of the servers.</tooltip> <can_focus>True</can_focus> <signal> <name>changed</name> <handler>on_metaserver_changed</handler> - <last_modification_time>Thu, 27 May 1999 01:00:54 GMT</last_modification_time> + <last_modification_time>Thu, 27 May 1999 01:02:26 GMT</last_modification_time> </signal> <editable>True</editable> <text_visible>True</text_visible> <text_max_length>0</text_max_length> <text></text> - </widget> - - <widget> - <class>GtkEntry</class> - <name>metaserver_entry_player_port</name> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -1416,22 +1421,22 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <tooltip>The port number to which players should connect. The default is 2592. If you have multiple servers on your machine, you may have to change this for one of the servers.</tooltip> + </widget> + + <widget> + <class>GtkEntry</class> + <name>metaserver_entry_observer_port</name> + <tooltip>The port number for observers to connect to. The default is 2593. </tooltip> <can_focus>True</can_focus> <signal> <name>changed</name> <handler>on_metaserver_changed</handler> - <last_modification_time>Thu, 27 May 1999 01:02:26 GMT</last_modification_time> + <last_modification_time>Thu, 27 May 1999 01:02:38 GMT</last_modification_time> </signal> <editable>True</editable> <text_visible>True</text_visible> <text_max_length>0</text_max_length> <text></text> - </widget> - - <widget> - <class>GtkEntry</class> - <name>metaserver_entry_observer_port</name> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -1446,22 +1451,22 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <tooltip>The port number for observers to connect to. The default is 2593. </tooltip> + </widget> + + <widget> + <class>GtkEntry</class> + <name>metaserver_entry_additional_comments</name> + <tooltip>Comments that you want sent to the metaserver. It is a good idea to include your electronic mail address, so that the metaserver administrator can contact you if she needs to.</tooltip> <can_focus>True</can_focus> <signal> <name>changed</name> <handler>on_metaserver_changed</handler> - <last_modification_time>Thu, 27 May 1999 01:02:38 GMT</last_modification_time> + <last_modification_time>Thu, 27 May 1999 01:02:51 GMT</last_modification_time> </signal> <editable>True</editable> <text_visible>True</text_visible> <text_max_length>0</text_max_length> <text></text> - </widget> - - <widget> - <class>GtkEntry</class> - <name>metaserver_entry_additional_comments</name> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -1476,22 +1481,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <tooltip>Comments that you want sent to the metaserver. It is a good idea to include your electronic mail address, so that the metaserver administrator can contact you if she needs to.</tooltip> - <can_focus>True</can_focus> - <signal> - <name>changed</name> - <handler>on_metaserver_changed</handler> - <last_modification_time>Thu, 27 May 1999 01:02:51 GMT</last_modification_time> - </signal> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> </widget> <widget> <class>GtkLabel</class> <name>label1383</name> + <label>(Fully qualified domain name or IP address)</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>2</left_attach> <right_attach>3</right_attach> @@ -1506,18 +1507,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>(Fully qualified domain name or IP address)</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1384</name> + <label>(Normally 3521)</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1384</name> <child> <left_attach>2</left_attach> <right_attach>3</right_attach> @@ -1532,18 +1533,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>(Normally 3521)</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1385</name> + <label>(In seconds, minimum 60)</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1385</name> <child> <left_attach>2</left_attach> <right_attach>3</right_attach> @@ -1558,18 +1559,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>(In seconds, minimum 60)</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1386</name> + <label>(In seconds)</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1386</name> <child> <left_attach>2</left_attach> <right_attach>3</right_attach> @@ -1584,18 +1585,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>(In seconds)</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1387</name> + <label>(Where you want clients to connect)</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1387</name> <child> <left_attach>2</left_attach> <right_attach>3</right_attach> @@ -1610,18 +1611,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>(Where you want clients to connect)</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1388</name> + <label>(B=Bronco, P=Practice, C=Chaos, H=Hockey)</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1388</name> <child> <left_attach>2</left_attach> <right_attach>3</right_attach> @@ -1636,18 +1637,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>(B=Bronco, P=Practice, C=Chaos, H=Hockey)</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1389</name> + <label>(Normally 2592)</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1389</name> <child> <left_attach>2</left_attach> <right_attach>3</right_attach> @@ -1662,18 +1663,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>(Normally 2592)</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1390</name> + <label>(Normally 2593)</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1390</name> <child> <left_attach>2</left_attach> <right_attach>3</right_attach> @@ -1688,18 +1689,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>(Normally 2593)</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label1391</name> + <label>(Include your mail address)</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label1391</name> <child> <left_attach>2</left_attach> <right_attach>3</right_attach> @@ -1714,18 +1715,22 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>(Include your mail address)</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkEntry</class> <name>metaserver_entry_maximum_update_time</name> + <tooltip>This is the maximum update time in seconds. It is the interval that must elapse before the server will repeat a solicitation that has not changed since the last solicitation sent to a particular metaserver.</tooltip> + <can_focus>True</can_focus> + <signal> + <name>changed</name> + <handler>on_metaserver_changed</handler> + <last_modification_time>Thu, 27 May 1999 01:00:36 GMT</last_modification_time> + </signal> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -1740,22 +1745,22 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <tooltip>This is the maximum update time in seconds. It is the interval that must elapse before the server will repeat a solicitation that has not changed since the last solicitation sent to a particular metaserver.</tooltip> + </widget> + + <widget> + <class>GtkEntry</class> + <name>metaserver_entry_server_type</name> + <tooltip>What type of server is this? Enter a letter from the list on the right. Failure to get the right letter will of course result in clients not listing your server.</tooltip> <can_focus>True</can_focus> <signal> <name>changed</name> <handler>on_metaserver_changed</handler> - <last_modification_time>Thu, 27 May 1999 01:00:36 GMT</last_modification_time> + <last_modification_time>Thu, 27 May 1999 02:13:30 GMT</last_modification_time> </signal> <editable>True</editable> <text_visible>True</text_visible> <text_max_length>0</text_max_length> <text></text> - </widget> - - <widget> - <class>GtkEntry</class> - <name>metaserver_entry_server_type</name> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -1770,22 +1775,22 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <tooltip>What type of server is this? Enter a letter from the list on the right. Failure to get the right letter will of course result in clients not listing your server.</tooltip> + </widget> + + <widget> + <class>GtkEntry</class> + <name>metaserver_entry_host_name</name> + <tooltip>This is the address to which your server will send solicitation messages. The gethostbyname() call is issued once when the server daemon starts. You can enter an IP address, host name from /etc/hosts, or a DNS host name. Common names are metaserver.netrek.org, metaserver.us.netrek.org, and metaserver.eu.netrek.org.</tooltip> <can_focus>True</can_focus> <signal> <name>changed</name> <handler>on_metaserver_changed</handler> - <last_modification_time>Thu, 27 May 1999 02:13:30 GMT</last_modification_time> + <last_modification_time>Thu, 27 May 1999 00:59:51 GMT</last_modification_time> </signal> <editable>True</editable> <text_visible>True</text_visible> <text_max_length>0</text_max_length> <text></text> - </widget> - - <widget> - <class>GtkEntry</class> - <name>metaserver_entry_host_name</name> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -1800,17 +1805,6 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <tooltip>This is the address to which your server will send solicitation messages. The gethostbyname() call is issued once when the server daemon starts. You can enter an IP address, host name from /etc/hosts, or a DNS host name. Common names are metaserver.netrek.org, metaserver.us.netrek.org, and metaserver.eu.netrek.org.</tooltip> - <can_focus>True</can_focus> - <signal> - <name>changed</name> - <handler>on_metaserver_changed</handler> - <last_modification_time>Thu, 27 May 1999 00:59:51 GMT</last_modification_time> - </signal> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> </widget> </widget> @@ -1818,17 +1812,17 @@ <class>GtkHButtonBox</class> <name>hbuttonbox5</name> <border_width>6</border_width> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - </child> <layout_style>GTK_BUTTONBOX_END</layout_style> <spacing>30</spacing> <child_min_width>85</child_min_width> <child_min_height>27</child_min_height> <child_ipad_x>7</child_ipad_x> <child_ipad_y>0</child_ipad_y> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>True</fill> + </child> <widget> <class>GtkButton</class> @@ -1906,6 +1900,14 @@ <widget> <class>GtkLabel</class> <name>label68</name> + <label>Server Status Settings +</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -1920,19 +1922,16 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Server Status Settings -</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkEntry</class> <name>PING_FREQ</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -1947,16 +1946,16 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> </widget> <widget> <class>GtkEntry</class> <name>PING_ILOSS_INTERVAL</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -1971,16 +1970,16 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> </widget> <widget> <class>GtkEntry</class> <name>PING_GHOSTBUST</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -1995,16 +1994,13 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> </widget> <widget> <class>GtkHBox</class> <name>hbox9</name> + <homogeneous>False</homogeneous> + <spacing>6</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -2019,33 +2015,26 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>6</spacing> <widget> <class>GtkEntry</class> <name>MOTD</name> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> <tooltip>The file to be displayed to players when they connect to the server, the Message Of The Day</tooltip> <can_focus>True</can_focus> <editable>True</editable> <text_visible>True</text_visible> <text_max_length>0</text_max_length> <text></text> - </widget> - - <widget> - <class>GtkButton</class> - <name>motd_button</name> <child> <padding>0</padding> <expand>True</expand> <fill>True</fill> </child> + </widget> + + <widget> + <class>GtkButton</class> + <name>motd_button</name> <can_focus>True</can_focus> <signal> <name>clicked</name> @@ -2053,12 +2042,24 @@ <last_modification_time>Thu, 14 Jan 1999 16:22:13 GMT</last_modification_time> </signal> <label>Select File...</label> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> </widget> </widget> <widget> <class>GtkLabel</class> <name>label85</name> + <label></label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -2073,18 +2074,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label></label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>MOTD_LABEL</name> + <label>Message of the day:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -2099,18 +2100,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Message of the day:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>SHOWSYSDEF_LABEL</name> + <label>SHOWSYSDEF:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>SHOWSYSDEF_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -2125,18 +2126,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>SHOWSYSDEF:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>LOADCHECK_LABEL</name> + <label>LOADCHECK:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>LOADCHECK_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -2151,18 +2152,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>LOADCHECK:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>MAXLOAD_LABEL</name> + <label>MAXLOAD:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>MAXLOAD_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -2177,18 +2178,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>MAXLOAD:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>CONFIRM_LABEL</name> + <label>CONFIRM:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>CONFIRM_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -2203,18 +2204,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>CONFIRM:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>UDP_LABEL</name> + <label>UDP:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>UDP_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -2229,18 +2230,19 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>UDP:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>PING_FREQ_LABEL</name> + <label>PING_FREQ:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>PING_FREQ_LABEL</name> + <default_focus_target>PING_FREQ</default_focus_target> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -2255,18 +2257,19 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>PING_FREQ:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>PING_ILOSS_INTERVAL_LABEL</name> + <label>PING_ILOSS_INTERVAL:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>PING_ILOSS_INTERVAL_LABEL</name> + <default_focus_target>PING_ILOSS_INTERVAL</default_focus_target> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -2281,18 +2284,19 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>PING_ILOSS_INTERVAL:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>PING_GHOSTBUST_LABEL</name> + <label>PING_GHOSTBUST:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>PING_GHOSTBUST_LABEL</name> + <default_focus_target>PING_GHOSTBUST</default_focus_target> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -2307,18 +2311,19 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>PING_GHOSTBUST:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>PING_GHOSTBUST_INTERVAL_LABEL</name> + <label>PING_GHOSTBUST_INTERVAL:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>PING_GHOSTBUST_INTERVAL_LABEL</name> + <default_focus_target>PING_GHOSTBUST_INTERVAL</default_focus_target> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -2333,18 +2338,16 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>PING_GHOSTBUST_INTERVAL:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkEntry</class> <name>PING_GHOSTBUST_INTERVAL</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -2359,16 +2362,13 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> </widget> <widget> <class>GtkHBox</class> <name>hbox11</name> + <homogeneous>False</homogeneous> + <spacing>10</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -2383,43 +2383,43 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>10</spacing> <widget> <class>GtkRadioButton</class> <name>LOADCHECK_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>True</active> <draw_indicator>True</draw_indicator> <group>LOADCHECK</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>LOADCHECK_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>LOADCHECK_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>LOADCHECK</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox12</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -2434,17 +2434,10 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkSpinButton</class> <name>MAXLOAD</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <climb_rate>1</climb_rate> <digits>1</digits> @@ -2452,18 +2445,25 @@ <update_policy>GTK_UPDATE_ALWAYS</update_policy> <snap>True</snap> <wrap>False</wrap> - <hvalue>10</hvalue> - <hlower>10</hlower> - <hupper>1000</hupper> - <hstep>25</hstep> - <hpage>10</hpage> - <hpage_size>10</hpage_size> + <value>10</value> + <lower>10</lower> + <upper>1000</upper> + <step>25</step> + <page>10</page> + <page_size>10</page_size> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox13</name> + <homogeneous>False</homogeneous> + <spacing>10</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -2478,58 +2478,58 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>10</spacing> <widget> <class>GtkRadioButton</class> <name>CONFIRM_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>None</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>CONFIRM</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>CONFIRM_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>CONFIRM_1</name> <can_focus>True</can_focus> <label>RSA</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>CONFIRM</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>CONFIRM_2</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>CONFIRM_2</name> <can_focus>True</can_focus> <label>RSA & reserved.c</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>CONFIRM</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox14</name> + <homogeneous>False</homogeneous> + <spacing>10</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -2544,73 +2544,73 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>10</spacing> <widget> <class>GtkRadioButton</class> <name>UDP_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>Disabled</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>UDP</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>UDP_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>UDP_1</name> <can_focus>True</can_focus> <label>Enabled</label> <active>True</active> <draw_indicator>True</draw_indicator> <group>UDP</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>UDP_2</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>UDP_2</name> <can_focus>True</can_focus> <label>Debug</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>UDP</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>UDP_3</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>UDP_3</name> <can_focus>True</can_focus> <label>Verbose</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>UDP</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox15</name> + <homogeneous>False</homogeneous> + <spacing>10</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -2625,43 +2625,48 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>10</spacing> <widget> <class>GtkRadioButton</class> <name>SHOWSYSDEF_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>SHOWSYSDEF</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>SHOWSYSDEF_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>SHOWSYSDEF_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>True</active> <draw_indicator>True</draw_indicator> <group>SHOWSYSDEF</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkLabel</class> <name>MAXUPDATE_LABEL</name> + <label>label132</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -2676,18 +2681,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>label132</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>DEFUPDATE_LABEL</name> + <label>label133</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>DEFUPDATE_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -2702,18 +2707,24 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>label133</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkSpinButton</class> <name>DEFUPDATE</name> + <can_focus>True</can_focus> + <climb_rate>1</climb_rate> + <digits>0</digits> + <numeric>False</numeric> + <update_policy>GTK_UPDATE_ALWAYS</update_policy> + <snap>True</snap> + <wrap>False</wrap> + <value>10</value> + <lower>1</lower> + <upper>10</upper> + <step>1</step> + <page>10</page> + <page_size>10</page_size> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -2728,6 +2739,11 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkSpinButton</class> + <name>MAXUPDATE</name> <can_focus>True</can_focus> <climb_rate>1</climb_rate> <digits>0</digits> @@ -2735,17 +2751,12 @@ <update_policy>GTK_UPDATE_ALWAYS</update_policy> <snap>True</snap> <wrap>False</wrap> - <hvalue>10</hvalue> - <hlower>1</hlower> - <hupper>10</hupper> - <hstep>1</hstep> - <hpage>10</hpage> - <hpage_size>10</hpage_size> - </widget> - - <widget> - <class>GtkSpinButton</class> - <name>MAXUPDATE</name> + <value>10</value> + <lower>1</lower> + <upper>10</upper> + <step>1</step> + <page>10</page> + <page_size>10</page_size> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -2760,19 +2771,6 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <climb_rate>1</climb_rate> - <digits>0</digits> - <numeric>False</numeric> - <update_policy>GTK_UPDATE_ALWAYS</update_policy> - <snap>True</snap> - <wrap>False</wrap> - <hvalue>10</hvalue> - <hlower>1</hlower> - <hupper>10</hupper> - <hstep>1</hstep> - <hpage>10</hpage> - <hpage_size>10</hpage_size> </widget> </widget> @@ -2793,7 +2791,7 @@ <class>GtkTable</class> <name>table4</name> <border_width>6</border_width> - <rows>17</rows> + <rows>18</rows> <columns>2</columns> <homogeneous>False</homogeneous> <row_spacing>6</row_spacing> @@ -2802,6 +2800,14 @@ <widget> <class>GtkLabel</class> <name>label69</name> + <label>Style Settings +</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -2816,19 +2822,22 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Style Settings -</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkHScale</class> <name>TOURN</name> + <can_focus>True</can_focus> + <draw_value>True</draw_value> + <value_pos>GTK_POS_TOP</value_pos> + <digits>0</digits> + <policy>GTK_UPDATE_CONTINUOUS</policy> + <value>4</value> + <lower>1</lower> + <upper>8</upper> + <step>1</step> + <page>0</page> + <page_size>0</page_size> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -2843,23 +2852,14 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <draw_value>True</draw_value> - <value_pos>GTK_POS_TOP</value_pos> - <digits>0</digits> - <policy>GTK_UPDATE_CONTINUOUS</policy> - <hvalue>4</hvalue> - <hlower>1</hlower> - <hupper>8</hupper> - <hstep>1</hstep> - <hpage>0</hpage> - <hpage_size>0</hpage_size> </widget> <widget> <class>GtkHBox</class> <name>hbox1</name> <border_width>6</border_width> + <homogeneous>False</homogeneous> + <spacing>6</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -2874,137 +2874,130 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>6</spacing> <widget> <class>GtkCheckButton</class> <name>SHIPS_SC</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - </child> <tooltip>Scout</tooltip> <can_focus>True</can_focus> <label>SC</label> <active>True</active> <draw_indicator>False</draw_indicator> - </widget> - - <widget> - <class>GtkCheckButton</class> - <name>SHIPS_DD</name> <child> <padding>0</padding> <expand>False</expand> <fill>True</fill> </child> + </widget> + + <widget> + <class>GtkCheckButton</class> + <name>SHIPS_DD</name> <tooltip>Destroyer</tooltip> <can_focus>True</can_focus> <label>DD</label> <active>True</active> <draw_indicator>False</draw_indicator> - </widget> - - <widget> - <class>GtkCheckButton</class> - <name>SHIPS_CA</name> <child> <padding>0</padding> <expand>False</expand> <fill>True</fill> </child> + </widget> + + <widget> + <class>GtkCheckButton</class> + <name>SHIPS_CA</name> <tooltip>Cruiser</tooltip> <can_focus>True</can_focus> <label>CA</label> <active>True</active> <draw_indicator>False</draw_indicator> - </widget> - - <widget> - <class>GtkCheckButton</class> - <name>SHIPS_BB</name> <child> <padding>0</padding> <expand>False</expand> <fill>True</fill> </child> + </widget> + + <widget> + <class>GtkCheckButton</class> + <name>SHIPS_BB</name> <tooltip>Battleship</tooltip> <can_focus>True</can_focus> <label>BB</label> <active>True</active> <draw_indicator>False</draw_indicator> - </widget> - - <widget> - <class>GtkCheckButton</class> - <name>SHIPS_AS</name> <child> <padding>0</padding> <expand>False</expand> <fill>True</fill> </child> + </widget> + + <widget> + <class>GtkCheckButton</class> + <name>SHIPS_AS</name> <tooltip>Assault Ship</tooltip> <can_focus>True</can_focus> <label>AS</label> <active>True</active> <draw_indicator>False</draw_indicator> - </widget> - - <widget> - <class>GtkCheckButton</class> - <name>SHIPS_SB</name> <child> <padding>0</padding> <expand>False</expand> <fill>True</fill> </child> + </widget> + + <widget> + <class>GtkCheckButton</class> + <name>SHIPS_SB</name> <tooltip>Starbase, or outpost</tooltip> <can_focus>True</can_focus> <label>SB</label> <active>True</active> <draw_indicator>False</draw_indicator> - </widget> - - <widget> - <class>GtkCheckButton</class> - <name>SHIPS_GA</name> <child> <padding>0</padding> <expand>False</expand> <fill>True</fill> </child> + </widget> + + <widget> + <class>GtkCheckButton</class> + <name>SHIPS_GA</name> <tooltip>Galaxy</tooltip> <can_focus>True</can_focus> <label>GA</label> <active>False</active> <draw_indicator>False</draw_indicator> - </widget> - - <widget> - <class>GtkCheckButton</class> - <name>SHIPS_AT</name> <child> <padding>0</padding> <expand>False</expand> <fill>True</fill> </child> + </widget> + + <widget> + <class>GtkCheckButton</class> + <name>SHIPS_AT</name> <tooltip>God ship, once someone has one of these, none of the others make any sense whatsoever.</tooltip> <can_focus>True</can_focus> <label>AT</label> <active>False</active> <draw_indicator>False</draw_indicator> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>True</fill> + </child> </widget> <widget> <class>GtkLabel</class> <name>label103</name> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> <label></label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -3012,6 +3005,11 @@ <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> </widget> </widget> @@ -3019,6 +3017,8 @@ <class>GtkHBox</class> <name>hbox2</name> <border_width>6</border_width> + <homogeneous>False</homogeneous> + <spacing>6</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -3033,43 +3033,36 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>6</spacing> <widget> <class>GtkToggleButton</class> <name>WEAPONS_PLASMA</name> + <can_focus>True</can_focus> + <label>PLASMA</label> + <active>True</active> <child> <padding>0</padding> <expand>False</expand> <fill>True</fill> </child> - <can_focus>True</can_focus> - <label>PLASMA</label> - <active>True</active> </widget> <widget> <class>GtkToggleButton</class> <name>WEAPONS_TRACTOR</name> + <can_focus>True</can_focus> + <label>TRACTOR</label> + <active>True</active> <child> <padding>0</padding> <expand>False</expand> <fill>True</fill> </child> - <can_focus>True</can_focus> - <label>TRACTOR</label> - <active>True</active> </widget> <widget> <class>GtkLabel</class> <name>label102</name> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> <label></label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -3077,12 +3070,28 @@ <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> </widget> </widget> <widget> <class>GtkHScale</class> <name>PLKILLS</name> + <can_focus>True</can_focus> + <draw_value>True</draw_value> + <value_pos>GTK_POS_TOP</value_pos> + <digits>0</digits> + <policy>GTK_UPDATE_CONTINUOUS</policy> + <value>2</value> + <lower>0</lower> + <upper>10</upper> + <step>1</step> + <page>0</page> + <page_size>0</page_size> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -3097,27 +3106,23 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <draw_value>True</draw_value> - <value_pos>GTK_POS_TOP</value_pos> - <digits>0</digits> - <policy>GTK_UPDATE_CONTINUOUS</policy> - <hvalue>2</hvalue> - <hlower>0</hlower> - <hupper>10</hupper> - <hstep>1</hstep> - <hpage>0</hpage> - <hpage_size>0</hpage_size> </widget> <widget> <class>GtkLabel</class> <name>label91</name> + <label></label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> - <top_attach>16</top_attach> - <bottom_attach>17</bottom_attach> + <top_attach>17</top_attach> + <bottom_attach>18</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>True</xexpand> @@ -3127,18 +3132,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label></label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>TOURN_LABEL</name> + <label>Number of players per team for T-Mode:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.7</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -3153,18 +3158,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Number of players per team for T-Mode:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.7</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>HUNTERKILLER_LABEL</name> + <label>Periodically send in Iggy robot:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -3179,18 +3184,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Periodically send in Iggy robot:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>RESETGALAXY_LABEL</name> + <label>Reset the galaxy on daemon restart:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>RESETGALAXY_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -3205,18 +3210,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Reset the galaxy on daemon restart:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>SHIPS_LABEL</name> + <label>Ships players may chose:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>SHIPS_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -3231,32 +3236,11 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Ships players may chose:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>WEAPONS_LABEL</name> - <child> - <left_attach>0</left_attach> - <right_attach>1</right_attach> - <top_attach>5</top_attach> - <bottom_attach>6</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>False</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>True</yfill> - </child> <label>Weapons enabled:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -3264,16 +3248,11 @@ <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>PLKILLS_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> - <top_attach>6</top_attach> - <bottom_attach>7</bottom_attach> + <top_attach>5</top_attach> + <bottom_attach>6</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -3283,6 +3262,11 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>PLKILLS_LABEL</name> <label>Kills required before refit for plasma:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -3290,16 +3274,11 @@ <yalign>0.7</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>SBRANK_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> - <top_attach>7</top_attach> - <bottom_attach>8</bottom_attach> + <top_attach>6</top_attach> + <bottom_attach>7</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -3309,32 +3288,11 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Rank required before refit to Stabase:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>NODIAG_LABEL</name> - <child> - <left_attach>0</left_attach> - <right_attach>1</right_attach> - <top_attach>8</top_attach> - <bottom_attach>9</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>False</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>True</yfill> - </child> <label>Prevent diagonal team selection:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -3342,11 +3300,6 @@ <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>TOPGUN_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -3361,6 +3314,11 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>TOPGUN_LABEL</name> <label>Enable TOPGUN mode:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -3368,11 +3326,6 @@ <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>NEWTURN_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -3387,6 +3340,11 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>NEWTURN_LABEL</name> <label>Enable new turning modifications:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -3394,11 +3352,6 @@ <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>HIDDEN_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -3413,6 +3366,11 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>HIDDEN_LABEL</name> <label>Ships hidden by distance in T-Mode:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -3420,11 +3378,6 @@ <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>SURRSTART_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -3439,6 +3392,11 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>SURRSTART_LABEL</name> <label>Race surrender starting point (planets):</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -3446,11 +3404,6 @@ <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>TRANSWARP_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -3465,6 +3418,11 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>TRANSWARP_LABEL</name> <label>Enable ship to Starbase transwarp:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -3472,11 +3430,6 @@ <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>WARPSPEED_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -3491,6 +3444,11 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>WARPSPEED_LABEL</name> <label>Transwarp speed:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -3498,11 +3456,6 @@ <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>VECTOR_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -3517,6 +3470,11 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>VECTOR_LABEL</name> <label>Enable vector torps:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -3524,16 +3482,32 @@ <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> + <child> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>16</top_attach> + <bottom_attach>17</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>True</yfill> + </child> </widget> <widget> <class>GtkHBox</class> <name>hbox29</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>9</top_attach> - <bottom_attach>10</bottom_attach> + <top_attach>10</top_attach> + <bottom_attach>11</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -3543,48 +3517,48 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>TOPGUN_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>TOPGUN</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>TOPGUN_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>TOPGUN_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>TOPGUN</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox28</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>8</top_attach> - <bottom_attach>9</bottom_attach> + <top_attach>9</top_attach> + <bottom_attach>10</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -3594,43 +3568,43 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>NODIAG_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>NODIAG</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>NODIAG_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>NODIAG_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>NODIAG</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox27</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -3645,43 +3619,43 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>RESETGALAXY_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>RESETGALAXY</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>RESETGALAXY_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>RESETGALAXY_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>RESETGALAXY</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox26</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -3696,48 +3670,48 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>HUNTERKILLER_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>HUNTERKILLER</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>HUNTERKILLER_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>HUNTERKILLER_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>HUNTERKILLER</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox30</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>10</top_attach> - <bottom_attach>11</bottom_attach> + <top_attach>11</top_attach> + <bottom_attach>12</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -3747,48 +3721,48 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>NEWTURN_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>NEWTURN</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>NEWTURN_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>NEWTURN_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>NEWTURN</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox31</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>13</top_attach> - <bottom_attach>14</bottom_attach> + <top_attach>14</top_attach> + <bottom_attach>15</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -3798,48 +3772,48 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>TRANSWARP_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>TRANSWARP</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>TRANSWARP_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>TRANSWARP_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>TRANSWARP</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox32</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>15</top_attach> - <bottom_attach>16</bottom_attach> + <top_attach>16</top_attach> + <bottom_attach>17</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -3849,50 +3823,50 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>VECTOR_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <sensitive>False</sensitive> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>VECTOR</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>VECTOR_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>VECTOR_1</name> <sensitive>False</sensitive> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>VECTOR</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox10</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>11</top_attach> - <bottom_attach>12</bottom_attach> + <top_attach>12</top_attach> + <bottom_attach>13</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -3902,48 +3876,57 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>HIDDEN_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>HIDDEN</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>HIDDEN_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>HIDDEN_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>True</active> <draw_indicator>True</draw_indicator> <group>HIDDEN</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHScale</class> <name>SURRSTART</name> + <can_focus>True</can_focus> + <draw_value>True</draw_value> + <value_pos>GTK_POS_TOP</value_pos> + <digits>0</digits> + <policy>GTK_UPDATE_CONTINUOUS</policy> + <value>2</value> + <lower>0</lower> + <upper>10</upper> + <step>1</step> + <page>0</page> + <page_size>0</page_size> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>12</top_attach> - <bottom_attach>13</bottom_attach> + <top_attach>13</top_attach> + <bottom_attach>14</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>True</xexpand> @@ -3953,27 +3936,29 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <draw_value>True</draw_value> - <value_pos>GTK_POS_TOP</value_pos> - <digits>0</digits> - <policy>GTK_UPDATE_CONTINUOUS</policy> - <hvalue>2</hvalue> - <hlower>0</hlower> - <hupper>10</hupper> - <hstep>1</hstep> - <hpage>0</hpage> - <hpage_size>0</hpage_size> </widget> <widget> <class>GtkSpinButton</class> <name>WARPSPEED</name> + <can_focus>True</can_focus> + <climb_rate>1</climb_rate> + <digits>0</digits> + <numeric>False</numeric> + <update_policy>GTK_UPDATE_ALWAYS</update_policy> + <snap>True</snap> + <wrap>False</wrap> + <value>60</value> + <lower>0</lower> + <upper>100</upper> + <step>1</step> + <page>10</page> + <page_size>10</page_size> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>14</top_attach> - <bottom_attach>15</bottom_attach> + <top_attach>15</top_attach> + <bottom_attach>16</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>True</xexpand> @@ -3983,24 +3968,16 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <climb_rate>1</climb_rate> - <digits>0</digits> - <numeric>False</numeric> - <update_policy>GTK_UPDATE_ALWAYS</update_policy> - <snap>True</snap> - <wrap>False</wrap> - <hvalue>60</hvalue> - <hlower>0</hlower> - <hupper>100</hupper> - <hstep>1</hstep> - <hpage>10</hpage> - <hpage_size>10</hpage_size> </widget> <widget> <class>GtkEntry</class> <name>SBRANK</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -4015,11 +3992,88 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>SBRANK_LABEL</name> + <label>Rank required before refit to Stabase:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> + <child> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>7</top_attach> + <bottom_attach>8</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>True</yfill> + </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>SBPLANETS_LABEL</name> + <label>SBPLANETS</label> + <justify>GTK_JUSTIFY_LEFT</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> + <child> + <left_attach>0</left_attach> + <right_attach>1</right_attach> + <top_attach>8</top_attach> + <bottom_attach>9</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>True</yfill> + </child> + </widget> + + <widget> + <class>GtkHScale</class> + <name>SBPLANETS</name> <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> + <draw_value>True</draw_value> + <value_pos>GTK_POS_TOP</value_pos> + <digits>0</digits> + <policy>GTK_UPDATE_CONTINUOUS</policy> + <value>5</value> + <lower>1</lower> + <upper>20</upper> + <step>1</step> + <page>0</page> + <page_size>0</page_size> + <child> + <left_attach>1</left_attach> + <right_attach>2</right_attach> + <top_attach>8</top_attach> + <bottom_attach>9</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>True</yfill> + </child> </widget> </widget> @@ -4049,6 +4103,14 @@ <widget> <class>GtkLabel</class> <name>label70</name> + <label>Clue Checking Settings +</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -4063,19 +4125,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Clue Checking Settings -</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label74</name> + <label></label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0.5</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label74</name> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -4090,18 +4151,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label></label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>CLUE_LABEL</name> + <label>CLUE:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -4116,18 +4177,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>CLUE:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>CLUERANK_LABEL</name> + <label>CLUERANK:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>CLUERANK_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -4142,18 +4203,13 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>CLUERANK:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkHBox</class> <name>hbox33</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -4168,58 +4224,61 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>CLUE_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>None</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>CLUE</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>CLUE_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>CLUE_1</name> <can_focus>True</can_focus> <label>Keyword</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>CLUE</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>CLUE_2</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>CLUE_2</name> <can_focus>True</can_focus> <label>Question & Answer</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>CLUE</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkEntry</class> <name>CLUERANK</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -4234,11 +4293,6 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> </widget> </widget> @@ -4268,6 +4322,14 @@ <widget> <class>GtkLabel</class> <name>label104</name> + <label>Messaging Settings +</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -4282,19 +4344,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Messaging Settings -</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label105</name> + <label></label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0.5</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label105</name> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -4309,18 +4370,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label></label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>CHECKMESG_LABEL</name> + <label>CHECKMESG:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -4335,18 +4396,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>CHECKMESG:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>LOGALL_LABEL</name> + <label>LOGALL:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>LOGALL_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -4361,18 +4422,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>LOGALL:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>LOGGOD_LABEL</name> + <label>LOGGOD:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>LOGGOD_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -4387,18 +4448,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>LOGGOD:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>EVENTLOG_LABEL</name> + <label>EVENTLOG:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>EVENTLOG_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -4413,18 +4474,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>EVENTLOG:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>DOOSHER_LABEL</name> + <label>DOOSHER:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>DOOSHER_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -4439,18 +4500,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>DOOSHER:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>CHECKSCUM_LABEL</name> + <label>CHECKSCUM:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>CHECKSCUM_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -4465,18 +4526,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>CHECKSCUM:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>WHYMESS_LABEL</name> + <label>WHYMESS:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>WHYMESS_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -4491,18 +4552,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>WHYMESS:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>ERROR_LEVEL_LABEL</name> + <label>ERROR_LEVEL:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>ERROR_LEVEL_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -4517,18 +4578,13 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>ERROR_LEVEL:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkHBox</class> <name>hbox36</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -4543,43 +4599,43 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>LOGGOD_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>LOGGOD</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>LOGGOD_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>LOGGOD_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>LOGGOD</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox35</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -4594,43 +4650,43 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>LOGALL_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>LOGALL</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>LOGALL_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>LOGALL_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>LOGALL</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox34</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -4645,43 +4701,43 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>CHECKMESG_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>CHECKMESG</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>CHECKMESG_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>CHECKMESG_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>CHECKMESG</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox37</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -4696,43 +4752,43 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>EVENTLOG_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>EVENTLOG</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>EVENTLOG_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>EVENTLOG_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>EVENTLOG</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox38</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -4747,43 +4803,43 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>DOOSHER_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>DOOSHER</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>DOOSHER_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>DOOSHER_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>DOOSHER</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox39</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -4798,43 +4854,43 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>CHECKSCUM_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>CHECKSCUM</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>CHECKSCUM_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>CHECKSCUM_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>CHECKSCUM</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox40</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -4849,43 +4905,43 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>WHYMESS_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>WHYMESS</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>WHYMESS_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>WHYMESS_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>WHYMESS</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox41</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -4900,17 +4956,10 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkSpinButton</class> <name>ERROR_LEVEL</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <climb_rate>1</climb_rate> <digits>0</digits> @@ -4918,12 +4967,17 @@ <update_policy>GTK_UPDATE_ALWAYS</update_policy> <snap>True</snap> <wrap>False</wrap> - <hvalue>0</hvalue> - <hlower>0</hlower> - <hupper>100</hupper> - <hstep>1</hstep> - <hpage>10</hpage> - <hpage_size>10</hpage_size> + <value>0</value> + <lower>0</lower> + <upper>100</upper> + <step>1</step> + <page>10</page> + <page_size>10</page_size> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> </widget> @@ -4954,6 +5008,14 @@ <widget> <class>GtkLabel</class> <name>label115</name> + <label>Galaxy and planet settings +</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -4968,20 +5030,14 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Galaxy and planet settings -</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkHBox</class> <name>hbox8</name> <border_width>6</border_width> + <homogeneous>False</homogeneous> + <spacing>6</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -4996,26 +5052,37 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>6</spacing> <widget> <class>GtkTable</class> <name>table13</name> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> <rows>1</rows> <columns>2</columns> <homogeneous>False</homogeneous> <row_spacing>0</row_spacing> <column_spacing>0</column_spacing> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> <widget> <class>GtkSpinButton</class> <name>START_ARMIES</name> + <can_focus>True</can_focus> + <climb_rate>1</climb_rate> + <digits>0</digits> + <numeric>True</numeric> + <update_policy>GTK_UPDATE_ALWAYS</update_policy> + <snap>True</snap> + <wrap>False</wrap> + <value>17</value> + <lower>1</lower> + <upper>100</upper> + <step>1</step> + <page>10</page> + <page_size>10</page_size> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -5030,24 +5097,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <climb_rate>1</climb_rate> - <digits>0</digits> - <numeric>True</numeric> - <update_policy>GTK_UPDATE_ALWAYS</update_policy> - <snap>True</snap> - <wrap>False</wrap> - <hvalue>17</hvalue> - <hlower>1</hlower> - <hupper>100</hupper> - <hstep>1</hstep> - <hpage>10</hpage> - <hpage_size>10</hpage_size> </widget> <widget> <class>GtkLabel</class> <name>label120</name> + <label></label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -5062,24 +5123,12 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label></label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> </widget> </widget> <widget> <class>GtkLabel</class> <name>label119</name> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> <label></label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -5087,6 +5136,11 @@ <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> </widget> </widget> @@ -5094,6 +5148,11 @@ <class>GtkTable</class> <name>table11</name> <border_width>6</border_width> + <rows>4</rows> + <columns>2</columns> + <homogeneous>False</homogeneous> + <row_spacing>6</row_spacing> + <column_spacing>6</column_spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -5108,29 +5167,10 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <rows>4</rows> - <columns>2</columns> - <homogeneous>False</homogeneous> - <row_spacing>6</row_spacing> - <column_spacing>6</column_spacing> <widget> <class>GtkOptionMenu</class> <name>PLANETS_1</name> - <child> - <left_attach>1</left_attach> - <right_attach>2</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>False</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>True</yfill> - </child> <sensitive>False</sensitive> <items>Romulus Eridani @@ -5144,16 +5184,11 @@ Hydrae </items> <initial_choice>0</initial_choice> - </widget> - - <widget> - <class>GtkOptionMenu</class> - <name>PLANETS_0</name> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>0</top_attach> - <bottom_attach>1</bottom_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -5163,6 +5198,11 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkOptionMenu</class> + <name>PLANETS_0</name> <sensitive>False</sensitive> <items>Earth Rigel @@ -5175,16 +5215,11 @@ Alpha Centauri </items> <initial_choice>0</initial_choice> - </widget> - - <widget> - <class>GtkOptionMenu</class> - <name>PLANETS_2</name> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>2</top_attach> - <bottom_attach>3</bottom_attach> + <top_attach>0</top_attach> + <bottom_attach>1</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -5194,6 +5229,11 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkOptionMenu</class> + <name>PLANETS_2</name> <sensitive>False</sensitive> <items>Klingus Pliedes V @@ -5207,16 +5247,11 @@ Achernar </items> <initial_choice>0</initial_choice> - </widget> - - <widget> - <class>GtkOptionMenu</class> - <name>PLANETS_3</name> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> - <top_attach>3</top_attach> - <bottom_attach>4</bottom_attach> + <top_attach>2</top_attach> + <bottom_attach>3</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -5226,6 +5261,11 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkOptionMenu</class> + <name>PLANETS_3</name> <sensitive>False</sensitive> <items>Orion Cassiopia @@ -5239,11 +5279,33 @@ Antares </items> <initial_choice>0</initial_choice> + <child> + <left_attach>1</left_attach> + <right_attach>2</right_attach> + <top_attach>3</top_attach> + <bottom_attach>4</bottom_attach> + <xpad>0</xpad> + <ypad>0</ypad> + <xexpand>False</xexpand> + <yexpand>False</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>True</yfill> + </child> </widget> <widget> <class>GtkLabel</class> <name>label64</name> + <sensitive>False</sensitive> + <label>Federation:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -5258,19 +5320,19 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label65</name> <sensitive>False</sensitive> - <label>Federation:</label> + <label>Romulan:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label65</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -5285,19 +5347,19 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label66</name> <sensitive>False</sensitive> - <label>Romulan:</label> + <label>Klingon:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label66</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -5312,19 +5374,19 @@ <xfill>True</xfill> <yfill>True</yfill> </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label67</name> <sensitive>False</sensitive> - <label>Klingon:</label> + <label>Orion:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label67</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -5339,20 +5401,19 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <sensitive>False</sensitive> - <label>Orion:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> </widget> <widget> <class>GtkLabel</class> <name>MAX_POP_LABEL</name> + <label>MAX_POP:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -5367,18 +5428,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>MAX_POP:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>PLANET_MOVE_LABEL</name> + <label>PLANET_MOVE:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>PLANET_MOVE_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -5393,18 +5454,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>PLANET_MOVE:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>WRAP_GALAXY_LABEL</name> + <label>WRAP_GALAXY:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>WRAP_GALAXY_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -5419,18 +5480,19 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>WRAP_GALAXY:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>PLANETS_LABEL_DISABLED</name> + <sensitive>False</sensitive> + <label>PLANETS:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.1</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -5445,19 +5507,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <sensitive>False</sensitive> - <label>PLANETS:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.1</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>START_ARMIES_LABEL</name> + <label>START_ARMIES:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -5472,18 +5533,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>START_ARMIES:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>label121</name> + <label></label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -5492,24 +5553,19 @@ <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> - <yexpand>True</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>True</yfill> - </child> - <label></label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> + <yexpand>True</yexpand> + <xshrink>False</xshrink> + <yshrink>False</yshrink> + <xfill>True</xfill> + <yfill>True</yfill> + </child> </widget> <widget> <class>GtkHBox</class> <name>hbox6</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -5524,43 +5580,43 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>PLANET_MOVE_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>PLANET_MOVE</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>PLANET_MOVE_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>PLANET_MOVE_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>PLANET_MOVE</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox7</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -5575,43 +5631,43 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>WRAP_GALAXY_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>WRAP_GALAXY</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>WRAP_GALAXY_01</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>WRAP_GALAXY_01</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>WRAP_GALAXY</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox5</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -5626,17 +5682,10 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkSpinButton</class> <name>MAX_POP</name> - <child> - <padding>6</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <climb_rate>1</climb_rate> <digits>0</digits> @@ -5644,22 +5693,22 @@ <update_policy>GTK_UPDATE_ALWAYS</update_policy> <snap>True</snap> <wrap>False</wrap> - <hvalue>70</hvalue> - <hlower>0</hlower> - <hupper>1000</hupper> - <hstep>10</hstep> - <hpage>10</hpage> - <hpage_size>10</hpage_size> + <value>70</value> + <lower>0</lower> + <upper>1000</upper> + <step>10</step> + <page>10</page> + <page_size>10</page_size> + <child> + <padding>6</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> <widget> <class>GtkLabel</class> <name>label116</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - </child> <label></label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> @@ -5667,6 +5716,11 @@ <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>True</fill> + </child> </widget> </widget> </widget> @@ -5697,6 +5751,14 @@ <widget> <class>GtkLabel</class> <name>label126</name> + <label>Base Practice Mode Settings +</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -5711,19 +5773,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Base Practice Mode Settings -</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>BASEPRACTICE_LABEL</name> + <label>BASEPRACTICE:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -5738,18 +5799,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>BASEPRACTICE:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>ROBOTHOST_LABEL</name> + <label>ROBOTHOST:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>ROBOTHOST_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -5764,18 +5825,13 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>ROBOTHOST:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkHBox</class> <name>hbox42</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -5790,43 +5846,43 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>BASEPRACTICE_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>BASEPRACTICE</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>BASEPRACTICE_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>BASEPRACTICE_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>BASEPRACTICE</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox43</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -5841,28 +5897,33 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkEntry</class> <name>ROBOTHOST</name> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> <can_focus>True</can_focus> <editable>True</editable> <text_visible>True</text_visible> <text_max_length>0</text_max_length> <text></text> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> </widget> </widget> <widget> <class>GtkLabel</class> <name>label127</name> + <label></label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -5877,13 +5938,6 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label></label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> </widget> </widget> @@ -5913,6 +5967,14 @@ <widget> <class>GtkLabel</class> <name>label128</name> + <label>Hockey Mode Settings +</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -5927,19 +5989,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Hockey Mode Settings -</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>HOCKEY_LABEL</name> + <label>HOCKEY:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -5954,18 +6015,13 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>HOCKEY:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkHBox</class> <name>hbox44</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -5980,43 +6036,48 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>HOCKEY_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>HOCKEY</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>HOCKEY_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>HOCKEY_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>HOCKEY</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkLabel</class> <name>label131</name> + <label></label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -6031,13 +6092,6 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label></label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> </widget> </widget> @@ -6067,6 +6121,8 @@ <widget> <class>GtkHBox</class> <name>hbox45</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -6081,43 +6137,49 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>INL_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> - <draw_indicator>True</draw_indicator> - <group>INL</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>INL_1</name> + <draw_indicator>True</draw_indicator> + <group>INL</group> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>INL_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>INL</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkLabel</class> <name>inl</name> + <label>INL Server Settings +</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -6132,19 +6194,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>INL Server Settings -</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label130</name> + <label></label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0.5</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label130</name> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -6159,18 +6220,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label></label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>INL_LABEL</name> + <label>INL:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -6185,18 +6246,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>INL:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>INL_RECORD_LABEL</name> + <label>INL_RECORD:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>INL_RECORD_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -6211,18 +6272,13 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>INL_RECORD:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkHBox</class> <name>hbox55</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -6237,37 +6293,35 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>INL_RECORD_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>INL_RECORD</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>INL_RECORD_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>INL_RECORD_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>INL_RECORD</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> </widget> @@ -6298,6 +6352,14 @@ <widget> <class>GtkLabel</class> <name>label124</name> + <label>Dogfight (Mars) Server Settings +</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -6312,19 +6374,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Dogfight (Mars) Server Settings -</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>DOGFIGHT_LABEL</name> + <label>DOGFIGHT:</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -6339,18 +6400,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>DOGFIGHT:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>CONTESTSIZE_LABEL</name> + <label>CONTESTSIZE:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>CONTESTSIZE_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -6365,18 +6426,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>CONTESTSIZE:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>NUMMATCH_LABEL</name> + <label>NUMMATCH:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>NUMMATCH_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -6391,18 +6452,19 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>NUMMATCH:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>SAVE_DOG_STAT_LABEL</name> + <label>SAVE_DOG_STAT:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>SAVE_DOG_STAT_LABEL</name> + <default_focus_target>SAVE_DOG_STAT</default_focus_target> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -6417,18 +6479,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>SAVE_DOG_STAT:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>label125</name> + <label></label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -6443,18 +6505,16 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label></label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkEntry</class> <name>SAVE_DOG_STAT</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -6469,16 +6529,16 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> </widget> <widget> <class>GtkEntry</class> <name>NUMMATCH</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -6493,16 +6553,16 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> </widget> <widget> <class>GtkEntry</class> <name>CONTESTSIZE</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -6517,16 +6577,16 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> </widget> <widget> <class>GtkEntry</class> <name>DOGFIGHT</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -6541,11 +6601,6 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> </widget> </widget> @@ -6575,6 +6630,14 @@ <widget> <class>GtkLabel</class> <name>SNAKEPATROL_LABEL</name> + <sensitive>False</sensitive> + <label>(unimplemented)</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -6589,19 +6652,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <sensitive>False</sensitive> - <label>(unimplemented)</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>MAX_CHAOS_BASES_LABEL</name> + <label>MAX_CHAOS_BASES:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>MAX_CHAOS_BASES_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -6616,18 +6678,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>MAX_CHAOS_BASES:</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>PINGPONG_PLASMA_LABEL</name> + <label>PINGPONG_PLASMA:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>PINGPONG_PLASMA_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -6642,18 +6704,19 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>PINGPONG_PLASMA:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>STARBASE_MINES_LABEL</name> + <sensitive>False</sensitive> + <label>(unimplemented)</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -6668,19 +6731,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <sensitive>False</sensitive> - <label>(unimplemented)</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>CHAOS_LABEL</name> + <label>CHAOS:</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>1</xalign> <yalign>0.5</yalign> <xpad>10</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>CHAOS_LABEL</name> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -6695,18 +6757,19 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>CHAOS:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkLabel</class> <name>label122</name> + <label>Chaos Settings +</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -6721,19 +6784,18 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>Chaos Settings -</label> + </widget> + + <widget> + <class>GtkLabel</class> + <name>label123</name> + <label></label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0.5</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label123</name> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> @@ -6748,18 +6810,13 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label></label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkHBox</class> <name>hbox46</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -6774,17 +6831,10 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkSpinButton</class> <name>MAX_CHAOS_BASES</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <width>60</width> <can_focus>True</can_focus> <climb_rate>1</climb_rate> @@ -6793,18 +6843,25 @@ <update_policy>GTK_UPDATE_ALWAYS</update_policy> <snap>True</snap> <wrap>False</wrap> - <hvalue>2</hvalue> - <hlower>0</hlower> - <hupper>16</hupper> - <hstep>1</hstep> - <hpage>10</hpage> - <hpage_size>10</hpage_size> + <value>2</value> + <lower>0</lower> + <upper>16</upper> + <step>1</step> + <page>10</page> + <page_size>10</page_size> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox47</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -6819,43 +6876,43 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>CHAOS_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>CHAOS</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>CHAOS_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>CHAOS_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>CHAOS</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox48</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -6870,45 +6927,45 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>STARBASE_MINES_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <sensitive>False</sensitive> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>STARBASE_MINES</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>STARBASE_MINES_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>STARBASE_MINES_1</name> <sensitive>False</sensitive> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>STARBASE_MINES</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox49</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -6923,43 +6980,43 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>PINGPONG_PLASMA_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>PINGPONG_PLASMA</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>PINGPONG_PLASMA_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>PINGPONG_PLASMA_1</name> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>PINGPONG_PLASMA</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkHBox</class> <name>hbox50</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -6974,45 +7031,50 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkRadioButton</class> <name>SNAKEPATROL_0</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <sensitive>False</sensitive> <can_focus>True</can_focus> <label>No</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>SNAKEPATROL</group> - </widget> - - <widget> - <class>GtkRadioButton</class> - <name>SNAKEPATROL_1</name> <child> <padding>0</padding> <expand>False</expand> <fill>False</fill> </child> + </widget> + + <widget> + <class>GtkRadioButton</class> + <name>SNAKEPATROL_1</name> <sensitive>False</sensitive> <can_focus>True</can_focus> <label>Yes</label> <active>False</active> <draw_indicator>True</draw_indicator> <group>SNAKEPATROL</group> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> </widget> </widget> <widget> <class>GtkLabel</class> <name>REALITY_LABEL</name> + <label>REALITY: </label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>10</xpad> + <ypad>0</ypad> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -7027,18 +7089,24 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <label>REALITY: </label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>10</xpad> - <ypad>0</ypad> </widget> <widget> <class>GtkSpinButton</class> <name>REALITY</name> + <can_focus>True</can_focus> + <climb_rate>1</climb_rate> + <digits>0</digits> + <numeric>False</numeric> + <update_policy>GTK_UPDATE_ALWAYS</update_policy> + <snap>True</snap> + <wrap>False</wrap> + <value>10</value> + <lower>1</lower> + <upper>20</upper> + <step>1</step> + <page>1</page> + <page_size>1</page_size> <child> <left_attach>1</left_attach> <right_attach>2</right_attach> @@ -7053,19 +7121,6 @@ <xfill>True</xfill> <yfill>True</yfill> </child> - <can_focus>True</can_focus> - <climb_rate>1</climb_rate> - <digits>0</digits> - <numeric>False</numeric> - <update_policy>GTK_UPDATE_ALWAYS</update_policy> - <snap>True</snap> - <wrap>False</wrap> - <hvalue>10</hvalue> - <hlower>1</hlower> - <hupper>20</hupper> - <hstep>1</hstep> - <hpage>1</hpage> - <hpage_size>1</hpage_size> </widget> </widget> @@ -7086,13 +7141,13 @@ <widget> <class>GtkHBox</class> <name>hbox52</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> <child> <padding>0</padding> <expand>True</expand> <fill>True</fill> </child> - <homogeneous>False</homogeneous> - <spacing>0</spacing> <widget> <class>GtkStatusbar</class> @@ -7109,17 +7164,17 @@ <class>GtkHButtonBox</class> <name>hbuttonbox1</name> <border_width>9</border_width> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> <layout_style>GTK_BUTTONBOX_END</layout_style> <spacing>30</spacing> <child_min_width>85</child_min_width> <child_min_height>27</child_min_height> <child_ipad_x>7</child_ipad_x> <child_ipad_y>0</child_ipad_y> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> <widget> <class>GtkButton</class> @@ -7173,12 +7228,13 @@ <title>gum - Select Message Of The Day</title> <type>GTK_WINDOW_DIALOG</type> <position>GTK_WIN_POS_MOUSE</position> - <show_file_op_buttons>False</show_file_op_buttons> + <modal>False</modal> <allow_shrink>False</allow_shrink> <allow_grow>True</allow_grow> <auto_shrink>False</auto_shrink> <wmclass_name>gummotd</wmclass_name> <wmclass_class>Gummotd</wmclass_class> + <show_file_op_buttons>False</show_file_op_buttons> <widget> <class>GtkButton</class> @@ -7220,6 +7276,7 @@ <title>unset title</title> <type>GTK_WINDOW_DIALOG</type> <position>GTK_WIN_POS_MOUSE</position> + <modal>False</modal> <allow_shrink>True</allow_shrink> <allow_grow>True</allow_grow> <auto_shrink>True</auto_shrink> @@ -7235,50 +7292,33 @@ <spacing>0</spacing> <widget> - <class>GtkLabel</class> - <name>message_label</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - <label>unset label</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - </widget> - - <widget> <class>GtkHBox</class> <child_name>Dialog:action_area</child_name> <name>dialog-action_area1</name> <border_width>10</border_width> + <homogeneous>True</homogeneous> + <spacing>5</spacing> <child> <padding>0</padding> <expand>False</expand> <fill>True</fill> <pack>GTK_PACK_END</pack> </child> - <homogeneous>True</homogeneous> - <spacing>5</spacing> <widget> <class>GtkHButtonBox</class> <name>hbuttonbox2</name> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style> <spacing>30</spacing> <child_min_width>85</child_min_width> <child_min_height>27</child_min_height> <child_ipad_x>7</child_ipad_x> <child_ipad_y>0</child_ipad_y> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> <widget> <class>GtkButton</class> @@ -7296,6 +7336,23 @@ </widget> </widget> </widget> + + <widget> + <class>GtkLabel</class> + <name>message_label</name> + <label>unset label</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>0.5</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + </widget> </widget> </widget> @@ -7311,12 +7368,13 @@ <title>gum - Open</title> <type>GTK_WINDOW_DIALOG</type> <position>GTK_WIN_POS_MOUSE</position> - <show_file_op_buttons>False</show_file_op_buttons> + <modal>False</modal> <allow_shrink>False</allow_shrink> <allow_grow>True</allow_grow> <auto_shrink>False</auto_shrink> <wmclass_name>gumopen</wmclass_name> <wmclass_class>Gumopen</wmclass_class> + <show_file_op_buttons>False</show_file_op_buttons> <widget> <class>GtkButton</class> @@ -7359,12 +7417,13 @@ <title>gum - Save As</title> <type>GTK_WINDOW_DIALOG</type> <position>GTK_WIN_POS_MOUSE</position> - <show_file_op_buttons>True</show_file_op_buttons> + <modal>False</modal> <allow_shrink>False</allow_shrink> <allow_grow>True</allow_grow> <auto_shrink>False</auto_shrink> <wmclass_name>gumsaveas</wmclass_name> <wmclass_class>Gumsaveas</wmclass_class> + <show_file_op_buttons>True</show_file_op_buttons> <widget> <class>GtkButton</class> @@ -7401,6 +7460,7 @@ <title>netrekconfig</title> <type>GTK_WINDOW_POPUP</type> <position>GTK_WIN_POS_CENTER</position> + <modal>False</modal> <allow_shrink>False</allow_shrink> <allow_grow>True</allow_grow> <auto_shrink>False</auto_shrink> @@ -7413,6 +7473,7 @@ <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> + <build_insensitive>True</build_insensitive> </widget> </widget> Index: Vanilla/gum/main.c diff -u Vanilla/gum/main.c:1.7 Vanilla/gum/main.c:1.8 --- Vanilla/gum/main.c:1.7 Thu Dec 30 00:39:58 1999 +++ Vanilla/gum/main.c Tue Aug 15 17:42:45 2000 @@ -6,6 +6,7 @@ # include <config.h> #endif +#include <sys/types.h> #include <sys/stat.h> #include <unistd.h> #include <string.h> @@ -18,13 +19,14 @@ #include "support.h" GtkWidget* -create_gum () +create_gum (void) { GtkWidget *gum; GtkWidget *vbox1; GtkWidget *menubar; GtkWidget *File; GtkWidget *menu7; + GtkAccelGroup *menu7_accels; GtkWidget *Open; GtkWidget *Reload; GtkWidget *Save; @@ -32,6 +34,7 @@ GtkWidget *Quit; GtkWidget *Help; GtkWidget *menu8; + GtkAccelGroup *menu8_accels; GtkWidget *About; GtkWidget *notebook1; GtkWidget *vbox2; @@ -133,9 +136,13 @@ GtkWidget *MAXLOAD_LABEL; GtkWidget *CONFIRM_LABEL; GtkWidget *UDP_LABEL; + guint PING_FREQ_LABEL_key; GtkWidget *PING_FREQ_LABEL; + guint PING_ILOSS_INTERVAL_LABEL_key; GtkWidget *PING_ILOSS_INTERVAL_LABEL; + guint PING_GHOSTBUST_LABEL_key; GtkWidget *PING_GHOSTBUST_LABEL; + guint PING_GHOSTBUST_INTERVAL_LABEL_key; GtkWidget *PING_GHOSTBUST_INTERVAL_LABEL; GtkWidget *PING_GHOSTBUST_INTERVAL; GtkWidget *hbox11; @@ -192,7 +199,6 @@ GtkWidget *SHIPS_LABEL; GtkWidget *WEAPONS_LABEL; GtkWidget *PLKILLS_LABEL; - GtkWidget *SBRANK_LABEL; GtkWidget *NODIAG_LABEL; GtkWidget *TOPGUN_LABEL; GtkWidget *NEWTURN_LABEL; @@ -237,6 +243,9 @@ GtkObject *WARPSPEED_adj; GtkWidget *WARPSPEED; GtkWidget *SBRANK; + GtkWidget *SBRANK_LABEL; + GtkWidget *SBPLANETS_LABEL; + GtkWidget *SBPLANETS; GtkWidget *label6; GtkWidget *table2; GtkWidget *label70; @@ -374,6 +383,7 @@ GtkWidget *DOGFIGHT_LABEL; GtkWidget *CONTESTSIZE_LABEL; GtkWidget *NUMMATCH_LABEL; + guint SAVE_DOG_STAT_LABEL_key; GtkWidget *SAVE_DOG_STAT_LABEL; GtkWidget *label125; GtkWidget *SAVE_DOG_STAT; @@ -429,94 +439,132 @@ gtk_object_set_data (GTK_OBJECT (gum), "gum", gum); gtk_window_set_title (GTK_WINDOW (gum), "Netrek Server"); gtk_window_set_policy (GTK_WINDOW (gum), TRUE, TRUE, FALSE); - gtk_window_set_wmclass (GTK_WINDOW (gum), "gum", "gum"); + gtk_window_set_wmclass (GTK_WINDOW (gum), "gum", "Gum"); vbox1 = gtk_vbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "vbox1", vbox1); + gtk_widget_ref (vbox1); + gtk_object_set_data_full (GTK_OBJECT (gum), "vbox1", vbox1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (vbox1); gtk_container_add (GTK_CONTAINER (gum), vbox1); menubar = gtk_menu_bar_new (); - gtk_object_set_data (GTK_OBJECT (gum), "menubar", menubar); + gtk_widget_ref (menubar); + gtk_object_set_data_full (GTK_OBJECT (gum), "menubar", menubar, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (menubar); gtk_box_pack_start (GTK_BOX (vbox1), menubar, TRUE, TRUE, 0); File = gtk_menu_item_new_with_label ("File"); - gtk_object_set_data (GTK_OBJECT (gum), "File", File); + gtk_widget_ref (File); + gtk_object_set_data_full (GTK_OBJECT (gum), "File", File, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (File); gtk_container_add (GTK_CONTAINER (menubar), File); menu7 = gtk_menu_new (); - gtk_object_set_data (GTK_OBJECT (gum), "menu7", menu7); + gtk_widget_ref (menu7); + gtk_object_set_data_full (GTK_OBJECT (gum), "menu7", menu7, + (GtkDestroyNotify) gtk_widget_unref); gtk_menu_item_set_submenu (GTK_MENU_ITEM (File), menu7); + menu7_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menu7)); Open = gtk_menu_item_new_with_label ("Open..."); - gtk_object_set_data (GTK_OBJECT (gum), "Open", Open); + gtk_widget_ref (Open); + gtk_object_set_data_full (GTK_OBJECT (gum), "Open", Open, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (Open); gtk_container_add (GTK_CONTAINER (menu7), Open); gtk_widget_add_accelerator (Open, "activate", accel_group, - GDK_O, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); + GDK_O, GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); Reload = gtk_menu_item_new_with_label ("Reload"); - gtk_object_set_data (GTK_OBJECT (gum), "Reload", Reload); + gtk_widget_ref (Reload); + gtk_object_set_data_full (GTK_OBJECT (gum), "Reload", Reload, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (Reload); gtk_container_add (GTK_CONTAINER (menu7), Reload); gtk_widget_add_accelerator (Reload, "activate", accel_group, - GDK_R, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); + GDK_R, GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); Save = gtk_menu_item_new_with_label ("Save"); - gtk_object_set_data (GTK_OBJECT (gum), "Save", Save); + gtk_widget_ref (Save); + gtk_object_set_data_full (GTK_OBJECT (gum), "Save", Save, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (Save); gtk_container_add (GTK_CONTAINER (menu7), Save); gtk_widget_add_accelerator (Save, "activate", accel_group, - GDK_S, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); + GDK_S, GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); Save_As = gtk_menu_item_new_with_label ("Save As..."); - gtk_object_set_data (GTK_OBJECT (gum), "Save_As", Save_As); + gtk_widget_ref (Save_As); + gtk_object_set_data_full (GTK_OBJECT (gum), "Save_As", Save_As, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (Save_As); gtk_container_add (GTK_CONTAINER (menu7), Save_As); Quit = gtk_menu_item_new_with_label ("Quit"); - gtk_object_set_data (GTK_OBJECT (gum), "Quit", Quit); + gtk_widget_ref (Quit); + gtk_object_set_data_full (GTK_OBJECT (gum), "Quit", Quit, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (Quit); gtk_container_add (GTK_CONTAINER (menu7), Quit); gtk_widget_add_accelerator (Quit, "activate", accel_group, - GDK_Q, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); + GDK_Q, GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); Help = gtk_menu_item_new_with_label ("Help"); - gtk_object_set_data (GTK_OBJECT (gum), "Help", Help); + gtk_widget_ref (Help); + gtk_object_set_data_full (GTK_OBJECT (gum), "Help", Help, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (Help); gtk_container_add (GTK_CONTAINER (menubar), Help); gtk_menu_item_right_justify (GTK_MENU_ITEM (Help)); menu8 = gtk_menu_new (); - gtk_object_set_data (GTK_OBJECT (gum), "menu8", menu8); + gtk_widget_ref (menu8); + gtk_object_set_data_full (GTK_OBJECT (gum), "menu8", menu8, + (GtkDestroyNotify) gtk_widget_unref); gtk_menu_item_set_submenu (GTK_MENU_ITEM (Help), menu8); + menu8_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menu8)); About = gtk_menu_item_new_with_label ("About"); - gtk_object_set_data (GTK_OBJECT (gum), "About", About); + gtk_widget_ref (About); + gtk_object_set_data_full (GTK_OBJECT (gum), "About", About, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (About); gtk_container_add (GTK_CONTAINER (menu8), About); notebook1 = gtk_notebook_new (); - gtk_object_set_data (GTK_OBJECT (gum), "notebook1", notebook1); + gtk_widget_ref (notebook1); + gtk_object_set_data_full (GTK_OBJECT (gum), "notebook1", notebook1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (notebook1); gtk_box_pack_start (GTK_BOX (vbox1), notebook1, TRUE, TRUE, 0); gtk_container_set_border_width (GTK_CONTAINER (notebook1), 10); vbox2 = gtk_vbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "vbox2", vbox2); + gtk_widget_ref (vbox2); + gtk_object_set_data_full (GTK_OBJECT (gum), "vbox2", vbox2, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (vbox2); gtk_container_add (GTK_CONTAINER (notebook1), vbox2); label140 = gtk_label_new ("Listener Port List"); - gtk_object_set_data (GTK_OBJECT (gum), "label140", label140); + gtk_widget_ref (label140); + gtk_object_set_data_full (GTK_OBJECT (gum), "label140", label140, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label140); gtk_box_pack_start (GTK_BOX (vbox2), label140, FALSE, TRUE, 6); gtk_misc_set_alignment (GTK_MISC (label140), 0.5, 1); listener_port_list = gtk_clist_new (7); - gtk_object_set_data (GTK_OBJECT (gum), "listener_port_list", listener_port_list); + gtk_widget_ref (listener_port_list); + gtk_object_set_data_full (GTK_OBJECT (gum), "listener_port_list", listener_port_list, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (listener_port_list); gtk_box_pack_start (GTK_BOX (vbox2), listener_port_list, TRUE, TRUE, 0); gtk_container_set_border_width (GTK_CONTAINER (listener_port_list), 9); @@ -531,47 +579,65 @@ gtk_clist_column_titles_show (GTK_CLIST (listener_port_list)); label135 = gtk_label_new ("Port"); - gtk_object_set_data (GTK_OBJECT (gum), "label135", label135); + gtk_widget_ref (label135); + gtk_object_set_data_full (GTK_OBJECT (gum), "label135", label135, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label135); gtk_clist_set_column_widget (GTK_CLIST (listener_port_list), 0, label135); label1351 = gtk_label_new ("Accepts"); - gtk_object_set_data (GTK_OBJECT (gum), "label1351", label1351); + gtk_widget_ref (label1351); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1351", label1351, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1351); gtk_clist_set_column_widget (GTK_CLIST (listener_port_list), 1, label1351); label1352 = gtk_label_new ("Denials"); - gtk_object_set_data (GTK_OBJECT (gum), "label1352", label1352); + gtk_widget_ref (label1352); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1352", label1352, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1352); gtk_clist_set_column_widget (GTK_CLIST (listener_port_list), 2, label1352); label1353 = gtk_label_new ("Forks"); - gtk_object_set_data (GTK_OBJECT (gum), "label1353", label1353); + gtk_widget_ref (label1353); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1353", label1353, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1353); gtk_clist_set_column_widget (GTK_CLIST (listener_port_list), 3, label1353); label136 = gtk_label_new ("File Name"); - gtk_object_set_data (GTK_OBJECT (gum), "label136", label136); + gtk_widget_ref (label136); + gtk_object_set_data_full (GTK_OBJECT (gum), "label136", label136, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label136); gtk_clist_set_column_widget (GTK_CLIST (listener_port_list), 4, label136); label137 = gtk_label_new ("Process Name"); - gtk_object_set_data (GTK_OBJECT (gum), "label137", label137); + gtk_widget_ref (label137); + gtk_object_set_data_full (GTK_OBJECT (gum), "label137", label137, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label137); gtk_clist_set_column_widget (GTK_CLIST (listener_port_list), 5, label137); label138 = gtk_label_new ("Arguments"); - gtk_object_set_data (GTK_OBJECT (gum), "label138", label138); + gtk_widget_ref (label138); + gtk_object_set_data_full (GTK_OBJECT (gum), "label138", label138, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label138); gtk_clist_set_column_widget (GTK_CLIST (listener_port_list), 6, label138); table14 = gtk_table_new (4, 3, FALSE); - gtk_object_set_data (GTK_OBJECT (gum), "table14", table14); + gtk_widget_ref (table14); + gtk_object_set_data_full (GTK_OBJECT (gum), "table14", table14, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (table14); gtk_box_pack_start (GTK_BOX (vbox2), table14, FALSE, TRUE, 6); label1354 = gtk_label_new ("Port: "); - gtk_object_set_data (GTK_OBJECT (gum), "label1354", label1354); + gtk_widget_ref (label1354); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1354", label1354, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1354); gtk_table_attach (GTK_TABLE (table14), label1354, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -580,7 +646,9 @@ gtk_misc_set_padding (GTK_MISC (label1354), 10, 0); label1356 = gtk_label_new ("Process Name: "); - gtk_object_set_data (GTK_OBJECT (gum), "label1356", label1356); + gtk_widget_ref (label1356); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1356", label1356, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1356); gtk_table_attach (GTK_TABLE (table14), label1356, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -589,7 +657,9 @@ gtk_misc_set_padding (GTK_MISC (label1356), 10, 0); label1357 = gtk_label_new ("Arguments: "); - gtk_object_set_data (GTK_OBJECT (gum), "label1357", label1357); + gtk_widget_ref (label1357); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1357", label1357, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1357); gtk_table_attach (GTK_TABLE (table14), label1357, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -598,35 +668,45 @@ gtk_misc_set_padding (GTK_MISC (label1357), 10, 0); listener_entry_port = gtk_entry_new_with_max_length (6); - gtk_object_set_data (GTK_OBJECT (gum), "listener_entry_port", listener_entry_port); + gtk_widget_ref (listener_entry_port); + gtk_object_set_data_full (GTK_OBJECT (gum), "listener_entry_port", listener_entry_port, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (listener_entry_port); gtk_table_attach (GTK_TABLE (table14), listener_entry_port, 1, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); listener_entry_program = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "listener_entry_program", listener_entry_program); + gtk_widget_ref (listener_entry_program); + gtk_object_set_data_full (GTK_OBJECT (gum), "listener_entry_program", listener_entry_program, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (listener_entry_program); gtk_table_attach (GTK_TABLE (table14), listener_entry_program, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); listener_entry_process = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "listener_entry_process", listener_entry_process); + gtk_widget_ref (listener_entry_process); + gtk_object_set_data_full (GTK_OBJECT (gum), "listener_entry_process", listener_entry_process, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (listener_entry_process); gtk_table_attach (GTK_TABLE (table14), listener_entry_process, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); listener_entry_arguments = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "listener_entry_arguments", listener_entry_arguments); + gtk_widget_ref (listener_entry_arguments); + gtk_object_set_data_full (GTK_OBJECT (gum), "listener_entry_arguments", listener_entry_arguments, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (listener_entry_arguments); gtk_table_attach (GTK_TABLE (table14), listener_entry_arguments, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); label1355 = gtk_label_new ("File Name: "); - gtk_object_set_data (GTK_OBJECT (gum), "label1355", label1355); + gtk_widget_ref (label1355); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1355", label1355, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1355); gtk_table_attach (GTK_TABLE (table14), label1355, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -635,7 +715,9 @@ gtk_misc_set_padding (GTK_MISC (label1355), 10, 0); label1358 = gtk_label_new ("(TCP/IP port number to accept connections on)"); - gtk_object_set_data (GTK_OBJECT (gum), "label1358", label1358); + gtk_widget_ref (label1358); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1358", label1358, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1358); gtk_table_attach (GTK_TABLE (table14), label1358, 2, 3, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -644,7 +726,9 @@ gtk_misc_set_padding (GTK_MISC (label1358), 10, 0); label1359 = gtk_label_new ("(Program to exec() on connection arrival)"); - gtk_object_set_data (GTK_OBJECT (gum), "label1359", label1359); + gtk_widget_ref (label1359); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1359", label1359, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1359); gtk_table_attach (GTK_TABLE (table14), label1359, 2, 3, 1, 2, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -653,7 +737,9 @@ gtk_misc_set_padding (GTK_MISC (label1359), 10, 0); label1360 = gtk_label_new ("(Process name to show on \"ps\")"); - gtk_object_set_data (GTK_OBJECT (gum), "label1360", label1360); + gtk_widget_ref (label1360); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1360", label1360, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1360); gtk_table_attach (GTK_TABLE (table14), label1360, 2, 3, 2, 3, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -662,7 +748,9 @@ gtk_misc_set_padding (GTK_MISC (label1360), 10, 0); label1361 = gtk_label_new ("(Additional program arguments, e.g. queue number)"); - gtk_object_set_data (GTK_OBJECT (gum), "label1361", label1361); + gtk_widget_ref (label1361); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1361", label1361, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1361); gtk_table_attach (GTK_TABLE (table14), label1361, 2, 3, 3, 4, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -671,113 +759,149 @@ gtk_misc_set_padding (GTK_MISC (label1361), 10, 0); hbuttonbox4 = gtk_hbutton_box_new (); - gtk_object_set_data (GTK_OBJECT (gum), "hbuttonbox4", hbuttonbox4); + gtk_widget_ref (hbuttonbox4); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbuttonbox4", hbuttonbox4, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbuttonbox4); gtk_box_pack_start (GTK_BOX (vbox2), hbuttonbox4, FALSE, TRUE, 0); gtk_container_set_border_width (GTK_CONTAINER (hbuttonbox4), 6); gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox4), GTK_BUTTONBOX_END); listener_port_add = gtk_button_new_with_label ("Add"); - gtk_object_set_data (GTK_OBJECT (gum), "listener_port_add", listener_port_add); + gtk_widget_ref (listener_port_add); + gtk_object_set_data_full (GTK_OBJECT (gum), "listener_port_add", listener_port_add, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (listener_port_add); gtk_container_add (GTK_CONTAINER (hbuttonbox4), listener_port_add); gtk_widget_set_sensitive (listener_port_add, FALSE); gtk_tooltips_set_tip (tooltips, listener_port_add, "Add an entry to the port list.", NULL); listener_port_update = gtk_button_new_with_label ("Update"); - gtk_object_set_data (GTK_OBJECT (gum), "listener_port_update", listener_port_update); + gtk_widget_ref (listener_port_update); + gtk_object_set_data_full (GTK_OBJECT (gum), "listener_port_update", listener_port_update, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (listener_port_update); gtk_container_add (GTK_CONTAINER (hbuttonbox4), listener_port_update); gtk_widget_set_sensitive (listener_port_update, FALSE); listener_port_delete = gtk_button_new_with_label ("Delete"); - gtk_object_set_data (GTK_OBJECT (gum), "listener_port_delete", listener_port_delete); + gtk_widget_ref (listener_port_delete); + gtk_object_set_data_full (GTK_OBJECT (gum), "listener_port_delete", listener_port_delete, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (listener_port_delete); gtk_container_add (GTK_CONTAINER (hbuttonbox4), listener_port_delete); gtk_widget_set_sensitive (listener_port_delete, FALSE); gtk_tooltips_set_tip (tooltips, listener_port_delete, "Delete the selected entry from the port list.", NULL); listener_port_save = gtk_button_new_with_label ("Save"); - gtk_object_set_data (GTK_OBJECT (gum), "listener_port_save", listener_port_save); + gtk_widget_ref (listener_port_save); + gtk_object_set_data_full (GTK_OBJECT (gum), "listener_port_save", listener_port_save, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (listener_port_save); gtk_container_add (GTK_CONTAINER (hbuttonbox4), listener_port_save); gtk_widget_set_sensitive (listener_port_save, FALSE); gtk_tooltips_set_tip (tooltips, listener_port_save, "Save the port list to the .ports file.", NULL); hseparator2 = gtk_hseparator_new (); - gtk_object_set_data (GTK_OBJECT (gum), "hseparator2", hseparator2); + gtk_widget_ref (hseparator2); + gtk_object_set_data_full (GTK_OBJECT (gum), "hseparator2", hseparator2, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hseparator2); gtk_box_pack_start (GTK_BOX (vbox2), hseparator2, FALSE, TRUE, 6); label139 = gtk_label_new ("Listener Process Commands"); - gtk_object_set_data (GTK_OBJECT (gum), "label139", label139); + gtk_widget_ref (label139); + gtk_object_set_data_full (GTK_OBJECT (gum), "label139", label139, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label139); gtk_box_pack_start (GTK_BOX (vbox2), label139, FALSE, TRUE, 0); gtk_misc_set_alignment (GTK_MISC (label139), 0.5, 1); hbox54 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox54", hbox54); + gtk_widget_ref (hbox54); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox54", hbox54, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox54); gtk_box_pack_start (GTK_BOX (vbox2), hbox54, FALSE, TRUE, 0); gtk_container_set_border_width (GTK_CONTAINER (hbox54), 6); label141 = gtk_label_new ("Caution:\nRemember the players."); - gtk_object_set_data (GTK_OBJECT (gum), "label141", label141); + gtk_widget_ref (label141); + gtk_object_set_data_full (GTK_OBJECT (gum), "label141", label141, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label141); gtk_box_pack_start (GTK_BOX (hbox54), label141, TRUE, TRUE, 0); gtk_label_set_justify (GTK_LABEL (label141), GTK_JUSTIFY_LEFT); hbuttonbox3 = gtk_hbutton_box_new (); - gtk_object_set_data (GTK_OBJECT (gum), "hbuttonbox3", hbuttonbox3); + gtk_widget_ref (hbuttonbox3); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbuttonbox3", hbuttonbox3, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbuttonbox3); gtk_box_pack_start (GTK_BOX (hbox54), hbuttonbox3, TRUE, TRUE, 0); gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox3), GTK_BUTTONBOX_END); listener_enable = gtk_button_new_with_label ("Enable"); - gtk_object_set_data (GTK_OBJECT (gum), "listener_enable", listener_enable); + gtk_widget_ref (listener_enable); + gtk_object_set_data_full (GTK_OBJECT (gum), "listener_enable", listener_enable, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (listener_enable); gtk_container_add (GTK_CONTAINER (hbuttonbox3), listener_enable); gtk_tooltips_set_tip (tooltips, listener_enable, "Enable access to the following command buttons.", NULL); listener_start = gtk_button_new_with_label ("Start"); - gtk_object_set_data (GTK_OBJECT (gum), "listener_start", listener_start); + gtk_widget_ref (listener_start); + gtk_object_set_data_full (GTK_OBJECT (gum), "listener_start", listener_start, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (listener_start); gtk_container_add (GTK_CONTAINER (hbuttonbox3), listener_start); gtk_widget_set_sensitive (listener_start, FALSE); gtk_tooltips_set_tip (tooltips, listener_start, "Start the listener process.", NULL); listener_restart = gtk_button_new_with_label ("Restart"); - gtk_object_set_data (GTK_OBJECT (gum), "listener_restart", listener_restart); + gtk_widget_ref (listener_restart); + gtk_object_set_data_full (GTK_OBJECT (gum), "listener_restart", listener_restart, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (listener_restart); gtk_container_add (GTK_CONTAINER (hbuttonbox3), listener_restart); gtk_widget_set_sensitive (listener_restart, FALSE); gtk_tooltips_set_tip (tooltips, listener_restart, "Signals the listener process to re-read the port list.", NULL); listener_stop = gtk_button_new_with_label ("Stop"); - gtk_object_set_data (GTK_OBJECT (gum), "listener_stop", listener_stop); + gtk_widget_ref (listener_stop); + gtk_object_set_data_full (GTK_OBJECT (gum), "listener_stop", listener_stop, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (listener_stop); gtk_container_add (GTK_CONTAINER (hbuttonbox3), listener_stop); gtk_widget_set_sensitive (listener_stop, FALSE); gtk_tooltips_set_tip (tooltips, listener_stop, "Stops the listener process, player connections will no longer be accepted, metaserver may delist your server.", NULL); label1 = gtk_label_new ("Listener"); - gtk_object_set_data (GTK_OBJECT (gum), "label1", label1); + gtk_widget_ref (label1); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1", label1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 0), label1); vbox3 = gtk_vbox_new (FALSE, 10); - gtk_object_set_data (GTK_OBJECT (gum), "vbox3", vbox3); + gtk_widget_ref (vbox3); + gtk_object_set_data_full (GTK_OBJECT (gum), "vbox3", vbox3, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (vbox3); gtk_container_add (GTK_CONTAINER (notebook1), vbox3); label1363 = gtk_label_new ("Metaserver List"); - gtk_object_set_data (GTK_OBJECT (gum), "label1363", label1363); + gtk_widget_ref (label1363); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1363", label1363, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1363); gtk_box_pack_start (GTK_BOX (vbox3), label1363, FALSE, TRUE, 0); gtk_misc_set_alignment (GTK_MISC (label1363), 0.5, 1); metaserver_list = gtk_clist_new (9); - gtk_object_set_data (GTK_OBJECT (gum), "metaserver_list", metaserver_list); + gtk_widget_ref (metaserver_list); + gtk_object_set_data_full (GTK_OBJECT (gum), "metaserver_list", metaserver_list, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (metaserver_list); gtk_box_pack_start (GTK_BOX (vbox3), metaserver_list, TRUE, TRUE, 0); GTK_WIDGET_UNSET_FLAGS (metaserver_list, GTK_CAN_FOCUS); @@ -794,57 +918,79 @@ gtk_clist_column_titles_show (GTK_CLIST (metaserver_list)); label1364 = gtk_label_new ("Metaserver\nHost Name"); - gtk_object_set_data (GTK_OBJECT (gum), "label1364", label1364); + gtk_widget_ref (label1364); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1364", label1364, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1364); gtk_clist_set_column_widget (GTK_CLIST (metaserver_list), 0, label1364); label1365 = gtk_label_new ("Metaserver\nPort Number"); - gtk_object_set_data (GTK_OBJECT (gum), "label1365", label1365); + gtk_widget_ref (label1365); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1365", label1365, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1365); gtk_clist_set_column_widget (GTK_CLIST (metaserver_list), 1, label1365); label1366 = gtk_label_new ("Minimum\nUpdate Time"); - gtk_object_set_data (GTK_OBJECT (gum), "label1366", label1366); + gtk_widget_ref (label1366); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1366", label1366, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1366); gtk_clist_set_column_widget (GTK_CLIST (metaserver_list), 2, label1366); label1367 = gtk_label_new ("Maximum\nUpdate Time"); - gtk_object_set_data (GTK_OBJECT (gum), "label1367", label1367); + gtk_widget_ref (label1367); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1367", label1367, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1367); gtk_clist_set_column_widget (GTK_CLIST (metaserver_list), 3, label1367); label1368 = gtk_label_new ("Server\nHost Name"); - gtk_object_set_data (GTK_OBJECT (gum), "label1368", label1368); + gtk_widget_ref (label1368); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1368", label1368, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1368); gtk_clist_set_column_widget (GTK_CLIST (metaserver_list), 4, label1368); label1369 = gtk_label_new ("Server\nType"); - gtk_object_set_data (GTK_OBJECT (gum), "label1369", label1369); + gtk_widget_ref (label1369); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1369", label1369, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1369); gtk_clist_set_column_widget (GTK_CLIST (metaserver_list), 5, label1369); label1370 = gtk_label_new ("Player\nPort"); - gtk_object_set_data (GTK_OBJECT (gum), "label1370", label1370); + gtk_widget_ref (label1370); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1370", label1370, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1370); gtk_clist_set_column_widget (GTK_CLIST (metaserver_list), 6, label1370); label1371 = gtk_label_new ("Observer\nPort"); - gtk_object_set_data (GTK_OBJECT (gum), "label1371", label1371); + gtk_widget_ref (label1371); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1371", label1371, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1371); gtk_clist_set_column_widget (GTK_CLIST (metaserver_list), 7, label1371); label1372 = gtk_label_new ("Additional\nComments"); - gtk_object_set_data (GTK_OBJECT (gum), "label1372", label1372); + gtk_widget_ref (label1372); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1372", label1372, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1372); gtk_clist_set_column_widget (GTK_CLIST (metaserver_list), 8, label1372); table15 = gtk_table_new (9, 3, FALSE); - gtk_object_set_data (GTK_OBJECT (gum), "table15", table15); + gtk_widget_ref (table15); + gtk_object_set_data_full (GTK_OBJECT (gum), "table15", table15, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (table15); gtk_box_pack_start (GTK_BOX (vbox3), table15, FALSE, TRUE, 10); label1373 = gtk_label_new ("Metaserver Host Name: "); - gtk_object_set_data (GTK_OBJECT (gum), "label1373", label1373); + gtk_widget_ref (label1373); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1373", label1373, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1373); gtk_table_attach (GTK_TABLE (table15), label1373, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -853,7 +999,9 @@ gtk_misc_set_padding (GTK_MISC (label1373), 10, 0); label1374 = gtk_label_new ("Metaserver Port Number: "); - gtk_object_set_data (GTK_OBJECT (gum), "label1374", label1374); + gtk_widget_ref (label1374); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1374", label1374, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1374); gtk_table_attach (GTK_TABLE (table15), label1374, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -862,7 +1010,9 @@ gtk_misc_set_padding (GTK_MISC (label1374), 10, 0); label1375 = gtk_label_new ("Minimum Update Time: "); - gtk_object_set_data (GTK_OBJECT (gum), "label1375", label1375); + gtk_widget_ref (label1375); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1375", label1375, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1375); gtk_table_attach (GTK_TABLE (table15), label1375, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -871,7 +1021,9 @@ gtk_misc_set_padding (GTK_MISC (label1375), 10, 0); label1376 = gtk_label_new ("Maximum Update Time: "); - gtk_object_set_data (GTK_OBJECT (gum), "label1376", label1376); + gtk_widget_ref (label1376); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1376", label1376, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1376); gtk_table_attach (GTK_TABLE (table15), label1376, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -880,7 +1032,9 @@ gtk_misc_set_padding (GTK_MISC (label1376), 10, 0); label1377 = gtk_label_new ("Server Host Name: "); - gtk_object_set_data (GTK_OBJECT (gum), "label1377", label1377); + gtk_widget_ref (label1377); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1377", label1377, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1377); gtk_table_attach (GTK_TABLE (table15), label1377, 0, 1, 4, 5, (GtkAttachOptions) (GTK_FILL), @@ -889,7 +1043,9 @@ gtk_misc_set_padding (GTK_MISC (label1377), 10, 0); label1378 = gtk_label_new ("Server Type: "); - gtk_object_set_data (GTK_OBJECT (gum), "label1378", label1378); + gtk_widget_ref (label1378); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1378", label1378, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1378); gtk_table_attach (GTK_TABLE (table15), label1378, 0, 1, 5, 6, (GtkAttachOptions) (GTK_FILL), @@ -898,7 +1054,9 @@ gtk_misc_set_padding (GTK_MISC (label1378), 10, 0); label1379 = gtk_label_new ("Player Port: "); - gtk_object_set_data (GTK_OBJECT (gum), "label1379", label1379); + gtk_widget_ref (label1379); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1379", label1379, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1379); gtk_table_attach (GTK_TABLE (table15), label1379, 0, 1, 6, 7, (GtkAttachOptions) (GTK_FILL), @@ -907,7 +1065,9 @@ gtk_misc_set_padding (GTK_MISC (label1379), 10, 0); label1380 = gtk_label_new ("Observer Port: "); - gtk_object_set_data (GTK_OBJECT (gum), "label1380", label1380); + gtk_widget_ref (label1380); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1380", label1380, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1380); gtk_table_attach (GTK_TABLE (table15), label1380, 0, 1, 7, 8, (GtkAttachOptions) (GTK_FILL), @@ -916,7 +1076,9 @@ gtk_misc_set_padding (GTK_MISC (label1380), 10, 0); label1381 = gtk_label_new ("Additional Comments: "); - gtk_object_set_data (GTK_OBJECT (gum), "label1381", label1381); + gtk_widget_ref (label1381); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1381", label1381, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1381); gtk_table_attach (GTK_TABLE (table15), label1381, 0, 1, 8, 9, (GtkAttachOptions) (GTK_FILL), @@ -925,7 +1087,9 @@ gtk_misc_set_padding (GTK_MISC (label1381), 10, 0); metaserver_entry_port_number = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "metaserver_entry_port_number", metaserver_entry_port_number); + gtk_widget_ref (metaserver_entry_port_number); + gtk_object_set_data_full (GTK_OBJECT (gum), "metaserver_entry_port_number", metaserver_entry_port_number, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (metaserver_entry_port_number); gtk_table_attach (GTK_TABLE (table15), metaserver_entry_port_number, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -933,7 +1097,9 @@ gtk_tooltips_set_tip (tooltips, metaserver_entry_port_number, "The port number at the metaserver that your server is to send the solicitation messages to. The default port is 3521, and should not be changed unless the metaserver administrator says so. Choosing the wrong port will simply delist your server.", NULL); metaserver_entry_minimum_update_time = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "metaserver_entry_minimum_update_time", metaserver_entry_minimum_update_time); + gtk_widget_ref (metaserver_entry_minimum_update_time); + gtk_object_set_data_full (GTK_OBJECT (gum), "metaserver_entry_minimum_update_time", metaserver_entry_minimum_update_time, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (metaserver_entry_minimum_update_time); gtk_table_attach (GTK_TABLE (table15), metaserver_entry_minimum_update_time, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -941,7 +1107,9 @@ gtk_tooltips_set_tip (tooltips, metaserver_entry_minimum_update_time, "The minimum update interval in seconds. The code forces this to a minimum of 60, because if you reduce it below 60 the metaserver will delist your server for flooding. Come on, once a minute is probably enough, eh?", NULL); metaserver_entry_server_host_name = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "metaserver_entry_server_host_name", metaserver_entry_server_host_name); + gtk_widget_ref (metaserver_entry_server_host_name); + gtk_object_set_data_full (GTK_OBJECT (gum), "metaserver_entry_server_host_name", metaserver_entry_server_host_name, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (metaserver_entry_server_host_name); gtk_table_attach (GTK_TABLE (table15), metaserver_entry_server_host_name, 1, 2, 4, 5, (GtkAttachOptions) (GTK_FILL), @@ -949,7 +1117,9 @@ gtk_tooltips_set_tip (tooltips, metaserver_entry_server_host_name, "The DNS host name of your server. This may well be different to the server host name, especially if you are using DNS aliases. This is the address that clients will connect to.", NULL); metaserver_entry_player_port = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "metaserver_entry_player_port", metaserver_entry_player_port); + gtk_widget_ref (metaserver_entry_player_port); + gtk_object_set_data_full (GTK_OBJECT (gum), "metaserver_entry_player_port", metaserver_entry_player_port, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (metaserver_entry_player_port); gtk_table_attach (GTK_TABLE (table15), metaserver_entry_player_port, 1, 2, 6, 7, (GtkAttachOptions) (GTK_FILL), @@ -957,7 +1127,9 @@ gtk_tooltips_set_tip (tooltips, metaserver_entry_player_port, "The port number to which players should connect. The default is 2592. If you have multiple servers on your machine, you may have to change this for one of the servers.", NULL); metaserver_entry_observer_port = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "metaserver_entry_observer_port", metaserver_entry_observer_port); + gtk_widget_ref (metaserver_entry_observer_port); + gtk_object_set_data_full (GTK_OBJECT (gum), "metaserver_entry_observer_port", metaserver_entry_observer_port, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (metaserver_entry_observer_port); gtk_table_attach (GTK_TABLE (table15), metaserver_entry_observer_port, 1, 2, 7, 8, (GtkAttachOptions) (GTK_FILL), @@ -965,7 +1137,9 @@ gtk_tooltips_set_tip (tooltips, metaserver_entry_observer_port, "The port number for observers to connect to. The default is 2593. ", NULL); metaserver_entry_additional_comments = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "metaserver_entry_additional_comments", metaserver_entry_additional_comments); + gtk_widget_ref (metaserver_entry_additional_comments); + gtk_object_set_data_full (GTK_OBJECT (gum), "metaserver_entry_additional_comments", metaserver_entry_additional_comments, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (metaserver_entry_additional_comments); gtk_table_attach (GTK_TABLE (table15), metaserver_entry_additional_comments, 1, 2, 8, 9, (GtkAttachOptions) (GTK_FILL), @@ -973,7 +1147,9 @@ gtk_tooltips_set_tip (tooltips, metaserver_entry_additional_comments, "Comments that you want sent to the metaserver. It is a good idea to include your electronic mail address, so that the metaserver administrator can contact you if she needs to.", NULL); label1383 = gtk_label_new ("(Fully qualified domain name or IP address)"); - gtk_object_set_data (GTK_OBJECT (gum), "label1383", label1383); + gtk_widget_ref (label1383); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1383", label1383, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1383); gtk_table_attach (GTK_TABLE (table15), label1383, 2, 3, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -982,7 +1158,9 @@ gtk_misc_set_padding (GTK_MISC (label1383), 10, 0); label1384 = gtk_label_new ("(Normally 3521)"); - gtk_object_set_data (GTK_OBJECT (gum), "label1384", label1384); + gtk_widget_ref (label1384); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1384", label1384, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1384); gtk_table_attach (GTK_TABLE (table15), label1384, 2, 3, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -991,7 +1169,9 @@ gtk_misc_set_padding (GTK_MISC (label1384), 10, 0); label1385 = gtk_label_new ("(In seconds, minimum 60)"); - gtk_object_set_data (GTK_OBJECT (gum), "label1385", label1385); + gtk_widget_ref (label1385); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1385", label1385, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1385); gtk_table_attach (GTK_TABLE (table15), label1385, 2, 3, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -1000,7 +1180,9 @@ gtk_misc_set_padding (GTK_MISC (label1385), 10, 0); label1386 = gtk_label_new ("(In seconds)"); - gtk_object_set_data (GTK_OBJECT (gum), "label1386", label1386); + gtk_widget_ref (label1386); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1386", label1386, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1386); gtk_table_attach (GTK_TABLE (table15), label1386, 2, 3, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -1009,7 +1191,9 @@ gtk_misc_set_padding (GTK_MISC (label1386), 10, 0); label1387 = gtk_label_new ("(Where you want clients to connect)"); - gtk_object_set_data (GTK_OBJECT (gum), "label1387", label1387); + gtk_widget_ref (label1387); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1387", label1387, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1387); gtk_table_attach (GTK_TABLE (table15), label1387, 2, 3, 4, 5, (GtkAttachOptions) (GTK_FILL), @@ -1018,7 +1202,9 @@ gtk_misc_set_padding (GTK_MISC (label1387), 10, 0); label1388 = gtk_label_new ("(B=Bronco, P=Practice, C=Chaos, H=Hockey)"); - gtk_object_set_data (GTK_OBJECT (gum), "label1388", label1388); + gtk_widget_ref (label1388); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1388", label1388, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1388); gtk_table_attach (GTK_TABLE (table15), label1388, 2, 3, 5, 6, (GtkAttachOptions) (GTK_FILL), @@ -1027,7 +1213,9 @@ gtk_misc_set_padding (GTK_MISC (label1388), 10, 0); label1389 = gtk_label_new ("(Normally 2592)"); - gtk_object_set_data (GTK_OBJECT (gum), "label1389", label1389); + gtk_widget_ref (label1389); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1389", label1389, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1389); gtk_table_attach (GTK_TABLE (table15), label1389, 2, 3, 6, 7, (GtkAttachOptions) (GTK_FILL), @@ -1036,7 +1224,9 @@ gtk_misc_set_padding (GTK_MISC (label1389), 10, 0); label1390 = gtk_label_new ("(Normally 2593)"); - gtk_object_set_data (GTK_OBJECT (gum), "label1390", label1390); + gtk_widget_ref (label1390); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1390", label1390, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1390); gtk_table_attach (GTK_TABLE (table15), label1390, 2, 3, 7, 8, (GtkAttachOptions) (GTK_FILL), @@ -1045,7 +1235,9 @@ gtk_misc_set_padding (GTK_MISC (label1390), 10, 0); label1391 = gtk_label_new ("(Include your mail address)"); - gtk_object_set_data (GTK_OBJECT (gum), "label1391", label1391); + gtk_widget_ref (label1391); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1391", label1391, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1391); gtk_table_attach (GTK_TABLE (table15), label1391, 2, 3, 8, 9, (GtkAttachOptions) (GTK_FILL), @@ -1054,7 +1246,9 @@ gtk_misc_set_padding (GTK_MISC (label1391), 10, 0); metaserver_entry_maximum_update_time = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "metaserver_entry_maximum_update_time", metaserver_entry_maximum_update_time); + gtk_widget_ref (metaserver_entry_maximum_update_time); + gtk_object_set_data_full (GTK_OBJECT (gum), "metaserver_entry_maximum_update_time", metaserver_entry_maximum_update_time, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (metaserver_entry_maximum_update_time); gtk_table_attach (GTK_TABLE (table15), metaserver_entry_maximum_update_time, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -1062,7 +1256,9 @@ gtk_tooltips_set_tip (tooltips, metaserver_entry_maximum_update_time, "This is the maximum update time in seconds. It is the interval that must elapse before the server will repeat a solicitation that has not changed since the last solicitation sent to a particular metaserver.", NULL); metaserver_entry_server_type = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "metaserver_entry_server_type", metaserver_entry_server_type); + gtk_widget_ref (metaserver_entry_server_type); + gtk_object_set_data_full (GTK_OBJECT (gum), "metaserver_entry_server_type", metaserver_entry_server_type, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (metaserver_entry_server_type); gtk_table_attach (GTK_TABLE (table15), metaserver_entry_server_type, 1, 2, 5, 6, (GtkAttachOptions) (GTK_FILL), @@ -1070,7 +1266,9 @@ gtk_tooltips_set_tip (tooltips, metaserver_entry_server_type, "What type of server is this? Enter a letter from the list on the right. Failure to get the right letter will of course result in clients not listing your server.", NULL); metaserver_entry_host_name = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "metaserver_entry_host_name", metaserver_entry_host_name); + gtk_widget_ref (metaserver_entry_host_name); + gtk_object_set_data_full (GTK_OBJECT (gum), "metaserver_entry_host_name", metaserver_entry_host_name, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (metaserver_entry_host_name); gtk_table_attach (GTK_TABLE (table15), metaserver_entry_host_name, 1, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -1078,39 +1276,53 @@ gtk_tooltips_set_tip (tooltips, metaserver_entry_host_name, "This is the address to which your server will send solicitation messages. The gethostbyname() call is issued once when the server daemon starts. You can enter an IP address, host name from /etc/hosts, or a DNS host name. Common names are metaserver.netrek.org, metaserver.us.netrek.org, and metaserver.eu.netrek.org.", NULL); hbuttonbox5 = gtk_hbutton_box_new (); - gtk_object_set_data (GTK_OBJECT (gum), "hbuttonbox5", hbuttonbox5); + gtk_widget_ref (hbuttonbox5); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbuttonbox5", hbuttonbox5, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbuttonbox5); gtk_box_pack_start (GTK_BOX (vbox3), hbuttonbox5, FALSE, TRUE, 0); gtk_container_set_border_width (GTK_CONTAINER (hbuttonbox5), 6); gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox5), GTK_BUTTONBOX_END); metaserver_add = gtk_button_new_with_label ("Add"); - gtk_object_set_data (GTK_OBJECT (gum), "metaserver_add", metaserver_add); + gtk_widget_ref (metaserver_add); + gtk_object_set_data_full (GTK_OBJECT (gum), "metaserver_add", metaserver_add, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (metaserver_add); gtk_container_add (GTK_CONTAINER (hbuttonbox5), metaserver_add); metaserver_update = gtk_button_new_with_label ("Update"); - gtk_object_set_data (GTK_OBJECT (gum), "metaserver_update", metaserver_update); + gtk_widget_ref (metaserver_update); + gtk_object_set_data_full (GTK_OBJECT (gum), "metaserver_update", metaserver_update, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (metaserver_update); gtk_container_add (GTK_CONTAINER (hbuttonbox5), metaserver_update); metaserver_delete = gtk_button_new_with_label ("Delete"); - gtk_object_set_data (GTK_OBJECT (gum), "metaserver_delete", metaserver_delete); + gtk_widget_ref (metaserver_delete); + gtk_object_set_data_full (GTK_OBJECT (gum), "metaserver_delete", metaserver_delete, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (metaserver_delete); gtk_container_add (GTK_CONTAINER (hbuttonbox5), metaserver_delete); metaserver_save = gtk_button_new_with_label ("Save"); - gtk_object_set_data (GTK_OBJECT (gum), "metaserver_save", metaserver_save); + gtk_widget_ref (metaserver_save); + gtk_object_set_data_full (GTK_OBJECT (gum), "metaserver_save", metaserver_save, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (metaserver_save); gtk_container_add (GTK_CONTAINER (hbuttonbox5), metaserver_save); label1362 = gtk_label_new ("Metaserver"); - gtk_object_set_data (GTK_OBJECT (gum), "label1362", label1362); + gtk_widget_ref (label1362); + gtk_object_set_data_full (GTK_OBJECT (gum), "label1362", label1362, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label1362); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 1), label1362); table1 = gtk_table_new (14, 2, FALSE); - gtk_object_set_data (GTK_OBJECT (gum), "table1", table1); + gtk_widget_ref (table1); + gtk_object_set_data_full (GTK_OBJECT (gum), "table1", table1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (table1); gtk_container_add (GTK_CONTAINER (notebook1), table1); gtk_container_set_border_width (GTK_CONTAINER (table1), 6); @@ -1118,60 +1330,78 @@ gtk_table_set_col_spacings (GTK_TABLE (table1), 6); label68 = gtk_label_new ("Server Status Settings\n"); - gtk_object_set_data (GTK_OBJECT (gum), "label68", label68); + gtk_widget_ref (label68); + gtk_object_set_data_full (GTK_OBJECT (gum), "label68", label68, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label68); gtk_table_attach (GTK_TABLE (table1), label68, 0, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); PING_FREQ = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "PING_FREQ", PING_FREQ); + gtk_widget_ref (PING_FREQ); + gtk_object_set_data_full (GTK_OBJECT (gum), "PING_FREQ", PING_FREQ, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PING_FREQ); gtk_table_attach (GTK_TABLE (table1), PING_FREQ, 1, 2, 7, 8, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); PING_ILOSS_INTERVAL = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "PING_ILOSS_INTERVAL", PING_ILOSS_INTERVAL); + gtk_widget_ref (PING_ILOSS_INTERVAL); + gtk_object_set_data_full (GTK_OBJECT (gum), "PING_ILOSS_INTERVAL", PING_ILOSS_INTERVAL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PING_ILOSS_INTERVAL); gtk_table_attach (GTK_TABLE (table1), PING_ILOSS_INTERVAL, 1, 2, 8, 9, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); PING_GHOSTBUST = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "PING_GHOSTBUST", PING_GHOSTBUST); + gtk_widget_ref (PING_GHOSTBUST); + gtk_object_set_data_full (GTK_OBJECT (gum), "PING_GHOSTBUST", PING_GHOSTBUST, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PING_GHOSTBUST); gtk_table_attach (GTK_TABLE (table1), PING_GHOSTBUST, 1, 2, 9, 10, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); hbox9 = gtk_hbox_new (FALSE, 6); - gtk_object_set_data (GTK_OBJECT (gum), "hbox9", hbox9); + gtk_widget_ref (hbox9); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox9", hbox9, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox9); gtk_table_attach (GTK_TABLE (table1), hbox9, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); MOTD = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "MOTD", MOTD); + gtk_widget_ref (MOTD); + gtk_object_set_data_full (GTK_OBJECT (gum), "MOTD", MOTD, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (MOTD); gtk_box_pack_start (GTK_BOX (hbox9), MOTD, TRUE, TRUE, 0); gtk_tooltips_set_tip (tooltips, MOTD, "The file to be displayed to players when they connect to the server, the Message Of The Day", NULL); motd_button = gtk_button_new_with_label ("Select File..."); - gtk_object_set_data (GTK_OBJECT (gum), "motd_button", motd_button); + gtk_widget_ref (motd_button); + gtk_object_set_data_full (GTK_OBJECT (gum), "motd_button", motd_button, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (motd_button); gtk_box_pack_start (GTK_BOX (hbox9), motd_button, TRUE, TRUE, 0); label85 = gtk_label_new (""); - gtk_object_set_data (GTK_OBJECT (gum), "label85", label85); + gtk_widget_ref (label85); + gtk_object_set_data_full (GTK_OBJECT (gum), "label85", label85, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label85); gtk_table_attach (GTK_TABLE (table1), label85, 0, 2, 13, 14, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); MOTD_LABEL = gtk_label_new ("Message of the day:"); - gtk_object_set_data (GTK_OBJECT (gum), "MOTD_LABEL", MOTD_LABEL); + gtk_widget_ref (MOTD_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "MOTD_LABEL", MOTD_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (MOTD_LABEL); gtk_table_attach (GTK_TABLE (table1), MOTD_LABEL, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -1180,7 +1410,9 @@ gtk_misc_set_padding (GTK_MISC (MOTD_LABEL), 10, 0); SHOWSYSDEF_LABEL = gtk_label_new ("SHOWSYSDEF:"); - gtk_object_set_data (GTK_OBJECT (gum), "SHOWSYSDEF_LABEL", SHOWSYSDEF_LABEL); + gtk_widget_ref (SHOWSYSDEF_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "SHOWSYSDEF_LABEL", SHOWSYSDEF_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SHOWSYSDEF_LABEL); gtk_table_attach (GTK_TABLE (table1), SHOWSYSDEF_LABEL, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -1189,7 +1421,9 @@ gtk_misc_set_padding (GTK_MISC (SHOWSYSDEF_LABEL), 10, 0); LOADCHECK_LABEL = gtk_label_new ("LOADCHECK:"); - gtk_object_set_data (GTK_OBJECT (gum), "LOADCHECK_LABEL", LOADCHECK_LABEL); + gtk_widget_ref (LOADCHECK_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "LOADCHECK_LABEL", LOADCHECK_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (LOADCHECK_LABEL); gtk_table_attach (GTK_TABLE (table1), LOADCHECK_LABEL, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -1198,7 +1432,9 @@ gtk_misc_set_padding (GTK_MISC (LOADCHECK_LABEL), 10, 0); MAXLOAD_LABEL = gtk_label_new ("MAXLOAD:"); - gtk_object_set_data (GTK_OBJECT (gum), "MAXLOAD_LABEL", MAXLOAD_LABEL); + gtk_widget_ref (MAXLOAD_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "MAXLOAD_LABEL", MAXLOAD_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (MAXLOAD_LABEL); gtk_table_attach (GTK_TABLE (table1), MAXLOAD_LABEL, 0, 1, 4, 5, (GtkAttachOptions) (GTK_FILL), @@ -1207,7 +1443,9 @@ gtk_misc_set_padding (GTK_MISC (MAXLOAD_LABEL), 10, 0); CONFIRM_LABEL = gtk_label_new ("CONFIRM:"); - gtk_object_set_data (GTK_OBJECT (gum), "CONFIRM_LABEL", CONFIRM_LABEL); + gtk_widget_ref (CONFIRM_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "CONFIRM_LABEL", CONFIRM_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CONFIRM_LABEL); gtk_table_attach (GTK_TABLE (table1), CONFIRM_LABEL, 0, 1, 5, 6, (GtkAttachOptions) (GTK_FILL), @@ -1216,7 +1454,9 @@ gtk_misc_set_padding (GTK_MISC (CONFIRM_LABEL), 10, 0); UDP_LABEL = gtk_label_new ("UDP:"); - gtk_object_set_data (GTK_OBJECT (gum), "UDP_LABEL", UDP_LABEL); + gtk_widget_ref (UDP_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "UDP_LABEL", UDP_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (UDP_LABEL); gtk_table_attach (GTK_TABLE (table1), UDP_LABEL, 0, 1, 6, 7, (GtkAttachOptions) (GTK_FILL), @@ -1224,8 +1464,12 @@ gtk_misc_set_alignment (GTK_MISC (UDP_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (UDP_LABEL), 10, 0); - PING_FREQ_LABEL = gtk_label_new ("PINGFREQ:"); - gtk_object_set_data (GTK_OBJECT (gum), "PING_FREQ_LABEL", PING_FREQ_LABEL); + PING_FREQ_LABEL = gtk_label_new (""); + PING_FREQ_LABEL_key = gtk_label_parse_uline (GTK_LABEL (PING_FREQ_LABEL), + "PING_FREQ:"); + gtk_widget_ref (PING_FREQ_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "PING_FREQ_LABEL", PING_FREQ_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PING_FREQ_LABEL); gtk_table_attach (GTK_TABLE (table1), PING_FREQ_LABEL, 0, 1, 7, 8, (GtkAttachOptions) (GTK_FILL), @@ -1233,8 +1477,12 @@ gtk_misc_set_alignment (GTK_MISC (PING_FREQ_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (PING_FREQ_LABEL), 10, 0); - PING_ILOSS_INTERVAL_LABEL = gtk_label_new ("PINGILOSSINTERVAL:"); - gtk_object_set_data (GTK_OBJECT (gum), "PING_ILOSS_INTERVAL_LABEL", PING_ILOSS_INTERVAL_LABEL); + PING_ILOSS_INTERVAL_LABEL = gtk_label_new (""); + PING_ILOSS_INTERVAL_LABEL_key = gtk_label_parse_uline (GTK_LABEL (PING_ILOSS_INTERVAL_LABEL), + "PING_ILOSS_INTERVAL:"); + gtk_widget_ref (PING_ILOSS_INTERVAL_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "PING_ILOSS_INTERVAL_LABEL", PING_ILOSS_INTERVAL_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PING_ILOSS_INTERVAL_LABEL); gtk_table_attach (GTK_TABLE (table1), PING_ILOSS_INTERVAL_LABEL, 0, 1, 8, 9, (GtkAttachOptions) (GTK_FILL), @@ -1242,8 +1490,12 @@ gtk_misc_set_alignment (GTK_MISC (PING_ILOSS_INTERVAL_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (PING_ILOSS_INTERVAL_LABEL), 10, 0); - PING_GHOSTBUST_LABEL = gtk_label_new ("PINGGHOSTBUST:"); - gtk_object_set_data (GTK_OBJECT (gum), "PING_GHOSTBUST_LABEL", PING_GHOSTBUST_LABEL); + PING_GHOSTBUST_LABEL = gtk_label_new (""); + PING_GHOSTBUST_LABEL_key = gtk_label_parse_uline (GTK_LABEL (PING_GHOSTBUST_LABEL), + "PING_GHOSTBUST:"); + gtk_widget_ref (PING_GHOSTBUST_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "PING_GHOSTBUST_LABEL", PING_GHOSTBUST_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PING_GHOSTBUST_LABEL); gtk_table_attach (GTK_TABLE (table1), PING_GHOSTBUST_LABEL, 0, 1, 9, 10, (GtkAttachOptions) (GTK_FILL), @@ -1251,8 +1503,12 @@ gtk_misc_set_alignment (GTK_MISC (PING_GHOSTBUST_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (PING_GHOSTBUST_LABEL), 10, 0); - PING_GHOSTBUST_INTERVAL_LABEL = gtk_label_new ("PINGGHOSTBUSTINTERVAL:"); - gtk_object_set_data (GTK_OBJECT (gum), "PING_GHOSTBUST_INTERVAL_LABEL", PING_GHOSTBUST_INTERVAL_LABEL); + PING_GHOSTBUST_INTERVAL_LABEL = gtk_label_new (""); + PING_GHOSTBUST_INTERVAL_LABEL_key = gtk_label_parse_uline (GTK_LABEL (PING_GHOSTBUST_INTERVAL_LABEL), + "PING_GHOSTBUST_INTERVAL:"); + gtk_widget_ref (PING_GHOSTBUST_INTERVAL_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "PING_GHOSTBUST_INTERVAL_LABEL", PING_GHOSTBUST_INTERVAL_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PING_GHOSTBUST_INTERVAL_LABEL); gtk_table_attach (GTK_TABLE (table1), PING_GHOSTBUST_INTERVAL_LABEL, 0, 1, 10, 11, (GtkAttachOptions) (GTK_FILL), @@ -1261,14 +1517,18 @@ gtk_misc_set_padding (GTK_MISC (PING_GHOSTBUST_INTERVAL_LABEL), 10, 0); PING_GHOSTBUST_INTERVAL = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "PING_GHOSTBUST_INTERVAL", PING_GHOSTBUST_INTERVAL); + gtk_widget_ref (PING_GHOSTBUST_INTERVAL); + gtk_object_set_data_full (GTK_OBJECT (gum), "PING_GHOSTBUST_INTERVAL", PING_GHOSTBUST_INTERVAL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PING_GHOSTBUST_INTERVAL); gtk_table_attach (GTK_TABLE (table1), PING_GHOSTBUST_INTERVAL, 1, 2, 10, 11, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); hbox11 = gtk_hbox_new (FALSE, 10); - gtk_object_set_data (GTK_OBJECT (gum), "hbox11", hbox11); + gtk_widget_ref (hbox11); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox11", hbox11, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox11); gtk_table_attach (GTK_TABLE (table1), hbox11, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -1276,19 +1536,25 @@ LOADCHECK_0 = gtk_radio_button_new_with_label (LOADCHECK_group, "No"); LOADCHECK_group = gtk_radio_button_group (GTK_RADIO_BUTTON (LOADCHECK_0)); - gtk_object_set_data (GTK_OBJECT (gum), "LOADCHECK_0", LOADCHECK_0); + gtk_widget_ref (LOADCHECK_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "LOADCHECK_0", LOADCHECK_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (LOADCHECK_0); gtk_box_pack_start (GTK_BOX (hbox11), LOADCHECK_0, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (LOADCHECK_0), TRUE); LOADCHECK_1 = gtk_radio_button_new_with_label (LOADCHECK_group, "Yes"); LOADCHECK_group = gtk_radio_button_group (GTK_RADIO_BUTTON (LOADCHECK_1)); - gtk_object_set_data (GTK_OBJECT (gum), "LOADCHECK_1", LOADCHECK_1); + gtk_widget_ref (LOADCHECK_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "LOADCHECK_1", LOADCHECK_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (LOADCHECK_1); gtk_box_pack_start (GTK_BOX (hbox11), LOADCHECK_1, FALSE, FALSE, 0); hbox12 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox12", hbox12); + gtk_widget_ref (hbox12); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox12", hbox12, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox12); gtk_table_attach (GTK_TABLE (table1), hbox12, 1, 2, 4, 5, (GtkAttachOptions) (GTK_FILL), @@ -1296,14 +1562,18 @@ MAXLOAD_adj = gtk_adjustment_new (10, 10, 1000, 25, 10, 10); MAXLOAD = gtk_spin_button_new (GTK_ADJUSTMENT (MAXLOAD_adj), 1, 1); - gtk_object_set_data (GTK_OBJECT (gum), "MAXLOAD", MAXLOAD); + gtk_widget_ref (MAXLOAD); + gtk_object_set_data_full (GTK_OBJECT (gum), "MAXLOAD", MAXLOAD, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (MAXLOAD); gtk_box_pack_start (GTK_BOX (hbox12), MAXLOAD, FALSE, FALSE, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (MAXLOAD), TRUE); gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (MAXLOAD), TRUE); hbox13 = gtk_hbox_new (FALSE, 10); - gtk_object_set_data (GTK_OBJECT (gum), "hbox13", hbox13); + gtk_widget_ref (hbox13); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox13", hbox13, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox13); gtk_table_attach (GTK_TABLE (table1), hbox13, 1, 2, 5, 6, (GtkAttachOptions) (GTK_FILL), @@ -1311,24 +1581,32 @@ CONFIRM_0 = gtk_radio_button_new_with_label (CONFIRM_group, "None"); CONFIRM_group = gtk_radio_button_group (GTK_RADIO_BUTTON (CONFIRM_0)); - gtk_object_set_data (GTK_OBJECT (gum), "CONFIRM_0", CONFIRM_0); + gtk_widget_ref (CONFIRM_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "CONFIRM_0", CONFIRM_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CONFIRM_0); gtk_box_pack_start (GTK_BOX (hbox13), CONFIRM_0, FALSE, FALSE, 0); CONFIRM_1 = gtk_radio_button_new_with_label (CONFIRM_group, "RSA"); CONFIRM_group = gtk_radio_button_group (GTK_RADIO_BUTTON (CONFIRM_1)); - gtk_object_set_data (GTK_OBJECT (gum), "CONFIRM_1", CONFIRM_1); + gtk_widget_ref (CONFIRM_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "CONFIRM_1", CONFIRM_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CONFIRM_1); gtk_box_pack_start (GTK_BOX (hbox13), CONFIRM_1, FALSE, FALSE, 0); CONFIRM_2 = gtk_radio_button_new_with_label (CONFIRM_group, "RSA & reserved.c"); CONFIRM_group = gtk_radio_button_group (GTK_RADIO_BUTTON (CONFIRM_2)); - gtk_object_set_data (GTK_OBJECT (gum), "CONFIRM_2", CONFIRM_2); + gtk_widget_ref (CONFIRM_2); + gtk_object_set_data_full (GTK_OBJECT (gum), "CONFIRM_2", CONFIRM_2, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CONFIRM_2); gtk_box_pack_start (GTK_BOX (hbox13), CONFIRM_2, FALSE, FALSE, 0); hbox14 = gtk_hbox_new (FALSE, 10); - gtk_object_set_data (GTK_OBJECT (gum), "hbox14", hbox14); + gtk_widget_ref (hbox14); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox14", hbox14, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox14); gtk_table_attach (GTK_TABLE (table1), hbox14, 1, 2, 6, 7, (GtkAttachOptions) (GTK_FILL), @@ -1336,31 +1614,41 @@ UDP_0 = gtk_radio_button_new_with_label (UDP_group, "Disabled"); UDP_group = gtk_radio_button_group (GTK_RADIO_BUTTON (UDP_0)); - gtk_object_set_data (GTK_OBJECT (gum), "UDP_0", UDP_0); + gtk_widget_ref (UDP_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "UDP_0", UDP_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (UDP_0); gtk_box_pack_start (GTK_BOX (hbox14), UDP_0, FALSE, FALSE, 0); UDP_1 = gtk_radio_button_new_with_label (UDP_group, "Enabled"); UDP_group = gtk_radio_button_group (GTK_RADIO_BUTTON (UDP_1)); - gtk_object_set_data (GTK_OBJECT (gum), "UDP_1", UDP_1); + gtk_widget_ref (UDP_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "UDP_1", UDP_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (UDP_1); gtk_box_pack_start (GTK_BOX (hbox14), UDP_1, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (UDP_1), TRUE); UDP_2 = gtk_radio_button_new_with_label (UDP_group, "Debug"); UDP_group = gtk_radio_button_group (GTK_RADIO_BUTTON (UDP_2)); - gtk_object_set_data (GTK_OBJECT (gum), "UDP_2", UDP_2); + gtk_widget_ref (UDP_2); + gtk_object_set_data_full (GTK_OBJECT (gum), "UDP_2", UDP_2, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (UDP_2); gtk_box_pack_start (GTK_BOX (hbox14), UDP_2, FALSE, FALSE, 0); UDP_3 = gtk_radio_button_new_with_label (UDP_group, "Verbose"); UDP_group = gtk_radio_button_group (GTK_RADIO_BUTTON (UDP_3)); - gtk_object_set_data (GTK_OBJECT (gum), "UDP_3", UDP_3); + gtk_widget_ref (UDP_3); + gtk_object_set_data_full (GTK_OBJECT (gum), "UDP_3", UDP_3, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (UDP_3); gtk_box_pack_start (GTK_BOX (hbox14), UDP_3, FALSE, FALSE, 0); hbox15 = gtk_hbox_new (FALSE, 10); - gtk_object_set_data (GTK_OBJECT (gum), "hbox15", hbox15); + gtk_widget_ref (hbox15); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox15", hbox15, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox15); gtk_table_attach (GTK_TABLE (table1), hbox15, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -1368,19 +1656,25 @@ SHOWSYSDEF_0 = gtk_radio_button_new_with_label (SHOWSYSDEF_group, "No"); SHOWSYSDEF_group = gtk_radio_button_group (GTK_RADIO_BUTTON (SHOWSYSDEF_0)); - gtk_object_set_data (GTK_OBJECT (gum), "SHOWSYSDEF_0", SHOWSYSDEF_0); + gtk_widget_ref (SHOWSYSDEF_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "SHOWSYSDEF_0", SHOWSYSDEF_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SHOWSYSDEF_0); gtk_box_pack_start (GTK_BOX (hbox15), SHOWSYSDEF_0, FALSE, FALSE, 0); SHOWSYSDEF_1 = gtk_radio_button_new_with_label (SHOWSYSDEF_group, "Yes"); SHOWSYSDEF_group = gtk_radio_button_group (GTK_RADIO_BUTTON (SHOWSYSDEF_1)); - gtk_object_set_data (GTK_OBJECT (gum), "SHOWSYSDEF_1", SHOWSYSDEF_1); + gtk_widget_ref (SHOWSYSDEF_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "SHOWSYSDEF_1", SHOWSYSDEF_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SHOWSYSDEF_1); gtk_box_pack_start (GTK_BOX (hbox15), SHOWSYSDEF_1, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (SHOWSYSDEF_1), TRUE); MAXUPDATE_LABEL = gtk_label_new ("label132"); - gtk_object_set_data (GTK_OBJECT (gum), "MAXUPDATE_LABEL", MAXUPDATE_LABEL); + gtk_widget_ref (MAXUPDATE_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "MAXUPDATE_LABEL", MAXUPDATE_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (MAXUPDATE_LABEL); gtk_table_attach (GTK_TABLE (table1), MAXUPDATE_LABEL, 0, 1, 11, 12, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -1389,7 +1683,9 @@ gtk_misc_set_padding (GTK_MISC (MAXUPDATE_LABEL), 10, 0); DEFUPDATE_LABEL = gtk_label_new ("label133"); - gtk_object_set_data (GTK_OBJECT (gum), "DEFUPDATE_LABEL", DEFUPDATE_LABEL); + gtk_widget_ref (DEFUPDATE_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "DEFUPDATE_LABEL", DEFUPDATE_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (DEFUPDATE_LABEL); gtk_table_attach (GTK_TABLE (table1), DEFUPDATE_LABEL, 0, 1, 12, 13, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -1399,7 +1695,9 @@ DEFUPDATE_adj = gtk_adjustment_new (10, 1, 10, 1, 10, 10); DEFUPDATE = gtk_spin_button_new (GTK_ADJUSTMENT (DEFUPDATE_adj), 1, 0); - gtk_object_set_data (GTK_OBJECT (gum), "DEFUPDATE", DEFUPDATE); + gtk_widget_ref (DEFUPDATE); + gtk_object_set_data_full (GTK_OBJECT (gum), "DEFUPDATE", DEFUPDATE, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (DEFUPDATE); gtk_table_attach (GTK_TABLE (table1), DEFUPDATE, 1, 2, 12, 13, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -1408,7 +1706,9 @@ MAXUPDATE_adj = gtk_adjustment_new (10, 1, 10, 1, 10, 10); MAXUPDATE = gtk_spin_button_new (GTK_ADJUSTMENT (MAXUPDATE_adj), 1, 0); - gtk_object_set_data (GTK_OBJECT (gum), "MAXUPDATE", MAXUPDATE); + gtk_widget_ref (MAXUPDATE); + gtk_object_set_data_full (GTK_OBJECT (gum), "MAXUPDATE", MAXUPDATE, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (MAXUPDATE); gtk_table_attach (GTK_TABLE (table1), MAXUPDATE, 1, 2, 11, 12, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -1416,12 +1716,16 @@ gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (MAXUPDATE), TRUE); label133 = gtk_label_new ("Status"); - gtk_object_set_data (GTK_OBJECT (gum), "label133", label133); + gtk_widget_ref (label133); + gtk_object_set_data_full (GTK_OBJECT (gum), "label133", label133, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label133); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label133); - table4 = gtk_table_new (17, 2, FALSE); - gtk_object_set_data (GTK_OBJECT (gum), "table4", table4); + table4 = gtk_table_new (18, 2, FALSE); + gtk_widget_ref (table4); + gtk_object_set_data_full (GTK_OBJECT (gum), "table4", table4, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (table4); gtk_container_add (GTK_CONTAINER (notebook1), table4); gtk_container_set_border_width (GTK_CONTAINER (table4), 6); @@ -1429,14 +1733,18 @@ gtk_table_set_col_spacings (GTK_TABLE (table4), 6); label69 = gtk_label_new ("Style Settings\n"); - gtk_object_set_data (GTK_OBJECT (gum), "label69", label69); + gtk_widget_ref (label69); + gtk_object_set_data_full (GTK_OBJECT (gum), "label69", label69, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label69); gtk_table_attach (GTK_TABLE (table4), label69, 0, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); TOURN = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (4, 1, 8, 1, 0, 0))); - gtk_object_set_data (GTK_OBJECT (gum), "TOURN", TOURN); + gtk_widget_ref (TOURN); + gtk_object_set_data_full (GTK_OBJECT (gum), "TOURN", TOURN, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (TOURN); gtk_table_attach (GTK_TABLE (table4), TOURN, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -1444,7 +1752,9 @@ gtk_scale_set_digits (GTK_SCALE (TOURN), 0); hbox1 = gtk_hbox_new (FALSE, 6); - gtk_object_set_data (GTK_OBJECT (gum), "hbox1", hbox1); + gtk_widget_ref (hbox1); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox1", hbox1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox1); gtk_table_attach (GTK_TABLE (table4), hbox1, 1, 2, 4, 5, (GtkAttachOptions) (GTK_FILL), @@ -1452,7 +1762,9 @@ gtk_container_set_border_width (GTK_CONTAINER (hbox1), 6); SHIPS_SC = gtk_check_button_new_with_label ("SC"); - gtk_object_set_data (GTK_OBJECT (gum), "SHIPS_SC", SHIPS_SC); + gtk_widget_ref (SHIPS_SC); + gtk_object_set_data_full (GTK_OBJECT (gum), "SHIPS_SC", SHIPS_SC, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SHIPS_SC); gtk_box_pack_start (GTK_BOX (hbox1), SHIPS_SC, FALSE, TRUE, 0); gtk_tooltips_set_tip (tooltips, SHIPS_SC, "Scout", NULL); @@ -1460,7 +1772,9 @@ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (SHIPS_SC), FALSE); SHIPS_DD = gtk_check_button_new_with_label ("DD"); - gtk_object_set_data (GTK_OBJECT (gum), "SHIPS_DD", SHIPS_DD); + gtk_widget_ref (SHIPS_DD); + gtk_object_set_data_full (GTK_OBJECT (gum), "SHIPS_DD", SHIPS_DD, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SHIPS_DD); gtk_box_pack_start (GTK_BOX (hbox1), SHIPS_DD, FALSE, TRUE, 0); gtk_tooltips_set_tip (tooltips, SHIPS_DD, "Destroyer", NULL); @@ -1468,7 +1782,9 @@ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (SHIPS_DD), FALSE); SHIPS_CA = gtk_check_button_new_with_label ("CA"); - gtk_object_set_data (GTK_OBJECT (gum), "SHIPS_CA", SHIPS_CA); + gtk_widget_ref (SHIPS_CA); + gtk_object_set_data_full (GTK_OBJECT (gum), "SHIPS_CA", SHIPS_CA, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SHIPS_CA); gtk_box_pack_start (GTK_BOX (hbox1), SHIPS_CA, FALSE, TRUE, 0); gtk_tooltips_set_tip (tooltips, SHIPS_CA, "Cruiser", NULL); @@ -1476,7 +1792,9 @@ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (SHIPS_CA), FALSE); SHIPS_BB = gtk_check_button_new_with_label ("BB"); - gtk_object_set_data (GTK_OBJECT (gum), "SHIPS_BB", SHIPS_BB); + gtk_widget_ref (SHIPS_BB); + gtk_object_set_data_full (GTK_OBJECT (gum), "SHIPS_BB", SHIPS_BB, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SHIPS_BB); gtk_box_pack_start (GTK_BOX (hbox1), SHIPS_BB, FALSE, TRUE, 0); gtk_tooltips_set_tip (tooltips, SHIPS_BB, "Battleship", NULL); @@ -1484,7 +1802,9 @@ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (SHIPS_BB), FALSE); SHIPS_AS = gtk_check_button_new_with_label ("AS"); - gtk_object_set_data (GTK_OBJECT (gum), "SHIPS_AS", SHIPS_AS); + gtk_widget_ref (SHIPS_AS); + gtk_object_set_data_full (GTK_OBJECT (gum), "SHIPS_AS", SHIPS_AS, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SHIPS_AS); gtk_box_pack_start (GTK_BOX (hbox1), SHIPS_AS, FALSE, TRUE, 0); gtk_tooltips_set_tip (tooltips, SHIPS_AS, "Assault Ship", NULL); @@ -1492,7 +1812,9 @@ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (SHIPS_AS), FALSE); SHIPS_SB = gtk_check_button_new_with_label ("SB"); - gtk_object_set_data (GTK_OBJECT (gum), "SHIPS_SB", SHIPS_SB); + gtk_widget_ref (SHIPS_SB); + gtk_object_set_data_full (GTK_OBJECT (gum), "SHIPS_SB", SHIPS_SB, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SHIPS_SB); gtk_box_pack_start (GTK_BOX (hbox1), SHIPS_SB, FALSE, TRUE, 0); gtk_tooltips_set_tip (tooltips, SHIPS_SB, "Starbase, or outpost", NULL); @@ -1500,26 +1822,34 @@ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (SHIPS_SB), FALSE); SHIPS_GA = gtk_check_button_new_with_label ("GA"); - gtk_object_set_data (GTK_OBJECT (gum), "SHIPS_GA", SHIPS_GA); + gtk_widget_ref (SHIPS_GA); + gtk_object_set_data_full (GTK_OBJECT (gum), "SHIPS_GA", SHIPS_GA, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SHIPS_GA); gtk_box_pack_start (GTK_BOX (hbox1), SHIPS_GA, FALSE, TRUE, 0); gtk_tooltips_set_tip (tooltips, SHIPS_GA, "Galaxy", NULL); gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (SHIPS_GA), FALSE); SHIPS_AT = gtk_check_button_new_with_label ("AT"); - gtk_object_set_data (GTK_OBJECT (gum), "SHIPS_AT", SHIPS_AT); + gtk_widget_ref (SHIPS_AT); + gtk_object_set_data_full (GTK_OBJECT (gum), "SHIPS_AT", SHIPS_AT, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SHIPS_AT); gtk_box_pack_start (GTK_BOX (hbox1), SHIPS_AT, FALSE, TRUE, 0); gtk_tooltips_set_tip (tooltips, SHIPS_AT, "God ship, once someone has one of these, none of the others make any sense whatsoever.", NULL); gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (SHIPS_AT), FALSE); label103 = gtk_label_new (""); - gtk_object_set_data (GTK_OBJECT (gum), "label103", label103); + gtk_widget_ref (label103); + gtk_object_set_data_full (GTK_OBJECT (gum), "label103", label103, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label103); gtk_box_pack_start (GTK_BOX (hbox1), label103, TRUE, TRUE, 0); hbox2 = gtk_hbox_new (FALSE, 6); - gtk_object_set_data (GTK_OBJECT (gum), "hbox2", hbox2); + gtk_widget_ref (hbox2); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox2", hbox2, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox2); gtk_table_attach (GTK_TABLE (table4), hbox2, 1, 2, 5, 6, (GtkAttachOptions) (GTK_FILL), @@ -1527,24 +1857,32 @@ gtk_container_set_border_width (GTK_CONTAINER (hbox2), 6); WEAPONS_PLASMA = gtk_toggle_button_new_with_label ("PLASMA"); - gtk_object_set_data (GTK_OBJECT (gum), "WEAPONS_PLASMA", WEAPONS_PLASMA); + gtk_widget_ref (WEAPONS_PLASMA); + gtk_object_set_data_full (GTK_OBJECT (gum), "WEAPONS_PLASMA", WEAPONS_PLASMA, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (WEAPONS_PLASMA); gtk_box_pack_start (GTK_BOX (hbox2), WEAPONS_PLASMA, FALSE, TRUE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WEAPONS_PLASMA), TRUE); WEAPONS_TRACTOR = gtk_toggle_button_new_with_label ("TRACTOR"); - gtk_object_set_data (GTK_OBJECT (gum), "WEAPONS_TRACTOR", WEAPONS_TRACTOR); + gtk_widget_ref (WEAPONS_TRACTOR); + gtk_object_set_data_full (GTK_OBJECT (gum), "WEAPONS_TRACTOR", WEAPONS_TRACTOR, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (WEAPONS_TRACTOR); gtk_box_pack_start (GTK_BOX (hbox2), WEAPONS_TRACTOR, FALSE, TRUE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WEAPONS_TRACTOR), TRUE); label102 = gtk_label_new (""); - gtk_object_set_data (GTK_OBJECT (gum), "label102", label102); + gtk_widget_ref (label102); + gtk_object_set_data_full (GTK_OBJECT (gum), "label102", label102, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label102); gtk_box_pack_start (GTK_BOX (hbox2), label102, TRUE, TRUE, 0); PLKILLS = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (2, 0, 10, 1, 0, 0))); - gtk_object_set_data (GTK_OBJECT (gum), "PLKILLS", PLKILLS); + gtk_widget_ref (PLKILLS); + gtk_object_set_data_full (GTK_OBJECT (gum), "PLKILLS", PLKILLS, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PLKILLS); gtk_table_attach (GTK_TABLE (table4), PLKILLS, 1, 2, 6, 7, (GtkAttachOptions) (GTK_FILL), @@ -1552,14 +1890,18 @@ gtk_scale_set_digits (GTK_SCALE (PLKILLS), 0); label91 = gtk_label_new (""); - gtk_object_set_data (GTK_OBJECT (gum), "label91", label91); + gtk_widget_ref (label91); + gtk_object_set_data_full (GTK_OBJECT (gum), "label91", label91, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label91); - gtk_table_attach (GTK_TABLE (table4), label91, 0, 2, 16, 17, + gtk_table_attach (GTK_TABLE (table4), label91, 0, 2, 17, 18, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); TOURN_LABEL = gtk_label_new ("Number of players per team for T-Mode:"); - gtk_object_set_data (GTK_OBJECT (gum), "TOURN_LABEL", TOURN_LABEL); + gtk_widget_ref (TOURN_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "TOURN_LABEL", TOURN_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (TOURN_LABEL); gtk_table_attach (GTK_TABLE (table4), TOURN_LABEL, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -1568,7 +1910,9 @@ gtk_misc_set_padding (GTK_MISC (TOURN_LABEL), 10, 0); HUNTERKILLER_LABEL = gtk_label_new ("Periodically send in Iggy robot:"); - gtk_object_set_data (GTK_OBJECT (gum), "HUNTERKILLER_LABEL", HUNTERKILLER_LABEL); + gtk_widget_ref (HUNTERKILLER_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "HUNTERKILLER_LABEL", HUNTERKILLER_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (HUNTERKILLER_LABEL); gtk_table_attach (GTK_TABLE (table4), HUNTERKILLER_LABEL, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -1577,7 +1921,9 @@ gtk_misc_set_padding (GTK_MISC (HUNTERKILLER_LABEL), 10, 0); RESETGALAXY_LABEL = gtk_label_new ("Reset the galaxy on daemon restart:"); - gtk_object_set_data (GTK_OBJECT (gum), "RESETGALAXY_LABEL", RESETGALAXY_LABEL); + gtk_widget_ref (RESETGALAXY_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "RESETGALAXY_LABEL", RESETGALAXY_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (RESETGALAXY_LABEL); gtk_table_attach (GTK_TABLE (table4), RESETGALAXY_LABEL, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -1586,7 +1932,9 @@ gtk_misc_set_padding (GTK_MISC (RESETGALAXY_LABEL), 10, 0); SHIPS_LABEL = gtk_label_new ("Ships players may chose:"); - gtk_object_set_data (GTK_OBJECT (gum), "SHIPS_LABEL", SHIPS_LABEL); + gtk_widget_ref (SHIPS_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "SHIPS_LABEL", SHIPS_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SHIPS_LABEL); gtk_table_attach (GTK_TABLE (table4), SHIPS_LABEL, 0, 1, 4, 5, (GtkAttachOptions) (GTK_FILL), @@ -1595,7 +1943,9 @@ gtk_misc_set_padding (GTK_MISC (SHIPS_LABEL), 10, 0); WEAPONS_LABEL = gtk_label_new ("Weapons enabled:"); - gtk_object_set_data (GTK_OBJECT (gum), "WEAPONS_LABEL", WEAPONS_LABEL); + gtk_widget_ref (WEAPONS_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "WEAPONS_LABEL", WEAPONS_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (WEAPONS_LABEL); gtk_table_attach (GTK_TABLE (table4), WEAPONS_LABEL, 0, 1, 5, 6, (GtkAttachOptions) (GTK_FILL), @@ -1604,7 +1954,9 @@ gtk_misc_set_padding (GTK_MISC (WEAPONS_LABEL), 10, 0); PLKILLS_LABEL = gtk_label_new ("Kills required before refit for plasma:"); - gtk_object_set_data (GTK_OBJECT (gum), "PLKILLS_LABEL", PLKILLS_LABEL); + gtk_widget_ref (PLKILLS_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "PLKILLS_LABEL", PLKILLS_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PLKILLS_LABEL); gtk_table_attach (GTK_TABLE (table4), PLKILLS_LABEL, 0, 1, 6, 7, (GtkAttachOptions) (GTK_FILL), @@ -1612,127 +1964,148 @@ gtk_misc_set_alignment (GTK_MISC (PLKILLS_LABEL), 1, 0.7); gtk_misc_set_padding (GTK_MISC (PLKILLS_LABEL), 10, 0); - SBRANK_LABEL = gtk_label_new ("Rank required before refit to Stabase:"); - gtk_object_set_data (GTK_OBJECT (gum), "SBRANK_LABEL", SBRANK_LABEL); - gtk_widget_show (SBRANK_LABEL); - gtk_table_attach (GTK_TABLE (table4), SBRANK_LABEL, 0, 1, 7, 8, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); - gtk_misc_set_alignment (GTK_MISC (SBRANK_LABEL), 1, 0.5); - gtk_misc_set_padding (GTK_MISC (SBRANK_LABEL), 10, 0); - NODIAG_LABEL = gtk_label_new ("Prevent diagonal team selection:"); - gtk_object_set_data (GTK_OBJECT (gum), "NODIAG_LABEL", NODIAG_LABEL); + gtk_widget_ref (NODIAG_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "NODIAG_LABEL", NODIAG_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (NODIAG_LABEL); - gtk_table_attach (GTK_TABLE (table4), NODIAG_LABEL, 0, 1, 8, 9, + gtk_table_attach (GTK_TABLE (table4), NODIAG_LABEL, 0, 1, 9, 10, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_misc_set_alignment (GTK_MISC (NODIAG_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (NODIAG_LABEL), 10, 0); TOPGUN_LABEL = gtk_label_new ("Enable TOPGUN mode:"); - gtk_object_set_data (GTK_OBJECT (gum), "TOPGUN_LABEL", TOPGUN_LABEL); + gtk_widget_ref (TOPGUN_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "TOPGUN_LABEL", TOPGUN_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (TOPGUN_LABEL); - gtk_table_attach (GTK_TABLE (table4), TOPGUN_LABEL, 0, 1, 9, 10, + gtk_table_attach (GTK_TABLE (table4), TOPGUN_LABEL, 0, 1, 10, 11, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_misc_set_alignment (GTK_MISC (TOPGUN_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (TOPGUN_LABEL), 10, 0); NEWTURN_LABEL = gtk_label_new ("Enable new turning modifications:"); - gtk_object_set_data (GTK_OBJECT (gum), "NEWTURN_LABEL", NEWTURN_LABEL); + gtk_widget_ref (NEWTURN_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "NEWTURN_LABEL", NEWTURN_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (NEWTURN_LABEL); - gtk_table_attach (GTK_TABLE (table4), NEWTURN_LABEL, 0, 1, 10, 11, + gtk_table_attach (GTK_TABLE (table4), NEWTURN_LABEL, 0, 1, 11, 12, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_misc_set_alignment (GTK_MISC (NEWTURN_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (NEWTURN_LABEL), 10, 0); HIDDEN_LABEL = gtk_label_new ("Ships hidden by distance in T-Mode:"); - gtk_object_set_data (GTK_OBJECT (gum), "HIDDEN_LABEL", HIDDEN_LABEL); + gtk_widget_ref (HIDDEN_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "HIDDEN_LABEL", HIDDEN_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (HIDDEN_LABEL); - gtk_table_attach (GTK_TABLE (table4), HIDDEN_LABEL, 0, 1, 11, 12, + gtk_table_attach (GTK_TABLE (table4), HIDDEN_LABEL, 0, 1, 12, 13, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_misc_set_alignment (GTK_MISC (HIDDEN_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (HIDDEN_LABEL), 10, 0); SURRSTART_LABEL = gtk_label_new ("Race surrender starting point (planets):"); - gtk_object_set_data (GTK_OBJECT (gum), "SURRSTART_LABEL", SURRSTART_LABEL); + gtk_widget_ref (SURRSTART_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "SURRSTART_LABEL", SURRSTART_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SURRSTART_LABEL); - gtk_table_attach (GTK_TABLE (table4), SURRSTART_LABEL, 0, 1, 12, 13, + gtk_table_attach (GTK_TABLE (table4), SURRSTART_LABEL, 0, 1, 13, 14, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_misc_set_alignment (GTK_MISC (SURRSTART_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (SURRSTART_LABEL), 10, 0); TRANSWARP_LABEL = gtk_label_new ("Enable ship to Starbase transwarp:"); - gtk_object_set_data (GTK_OBJECT (gum), "TRANSWARP_LABEL", TRANSWARP_LABEL); + gtk_widget_ref (TRANSWARP_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "TRANSWARP_LABEL", TRANSWARP_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (TRANSWARP_LABEL); - gtk_table_attach (GTK_TABLE (table4), TRANSWARP_LABEL, 0, 1, 13, 14, + gtk_table_attach (GTK_TABLE (table4), TRANSWARP_LABEL, 0, 1, 14, 15, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_misc_set_alignment (GTK_MISC (TRANSWARP_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (TRANSWARP_LABEL), 10, 0); WARPSPEED_LABEL = gtk_label_new ("Transwarp speed:"); - gtk_object_set_data (GTK_OBJECT (gum), "WARPSPEED_LABEL", WARPSPEED_LABEL); + gtk_widget_ref (WARPSPEED_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "WARPSPEED_LABEL", WARPSPEED_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (WARPSPEED_LABEL); - gtk_table_attach (GTK_TABLE (table4), WARPSPEED_LABEL, 0, 1, 14, 15, + gtk_table_attach (GTK_TABLE (table4), WARPSPEED_LABEL, 0, 1, 15, 16, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_misc_set_alignment (GTK_MISC (WARPSPEED_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (WARPSPEED_LABEL), 10, 0); VECTOR_LABEL = gtk_label_new ("Enable vector torps:"); - gtk_object_set_data (GTK_OBJECT (gum), "VECTOR_LABEL", VECTOR_LABEL); + gtk_widget_ref (VECTOR_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "VECTOR_LABEL", VECTOR_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (VECTOR_LABEL); - gtk_table_attach (GTK_TABLE (table4), VECTOR_LABEL, 0, 1, 15, 16, + gtk_table_attach (GTK_TABLE (table4), VECTOR_LABEL, 0, 1, 16, 17, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_misc_set_alignment (GTK_MISC (VECTOR_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (VECTOR_LABEL), 10, 0); hbox29 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox29", hbox29); + gtk_widget_ref (hbox29); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox29", hbox29, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox29); - gtk_table_attach (GTK_TABLE (table4), hbox29, 1, 2, 9, 10, + gtk_table_attach (GTK_TABLE (table4), hbox29, 1, 2, 10, 11, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); TOPGUN_0 = gtk_radio_button_new_with_label (TOPGUN_group, "No"); TOPGUN_group = gtk_radio_button_group (GTK_RADIO_BUTTON (TOPGUN_0)); - gtk_object_set_data (GTK_OBJECT (gum), "TOPGUN_0", TOPGUN_0); + gtk_widget_ref (TOPGUN_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "TOPGUN_0", TOPGUN_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (TOPGUN_0); gtk_box_pack_start (GTK_BOX (hbox29), TOPGUN_0, FALSE, FALSE, 0); TOPGUN_1 = gtk_radio_button_new_with_label (TOPGUN_group, "Yes"); TOPGUN_group = gtk_radio_button_group (GTK_RADIO_BUTTON (TOPGUN_1)); - gtk_object_set_data (GTK_OBJECT (gum), "TOPGUN_1", TOPGUN_1); + gtk_widget_ref (TOPGUN_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "TOPGUN_1", TOPGUN_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (TOPGUN_1); gtk_box_pack_start (GTK_BOX (hbox29), TOPGUN_1, FALSE, FALSE, 0); hbox28 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox28", hbox28); + gtk_widget_ref (hbox28); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox28", hbox28, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox28); - gtk_table_attach (GTK_TABLE (table4), hbox28, 1, 2, 8, 9, + gtk_table_attach (GTK_TABLE (table4), hbox28, 1, 2, 9, 10, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); NODIAG_0 = gtk_radio_button_new_with_label (NODIAG_group, "No"); NODIAG_group = gtk_radio_button_group (GTK_RADIO_BUTTON (NODIAG_0)); - gtk_object_set_data (GTK_OBJECT (gum), "NODIAG_0", NODIAG_0); + gtk_widget_ref (NODIAG_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "NODIAG_0", NODIAG_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (NODIAG_0); gtk_box_pack_start (GTK_BOX (hbox28), NODIAG_0, FALSE, FALSE, 0); NODIAG_1 = gtk_radio_button_new_with_label (NODIAG_group, "Yes"); NODIAG_group = gtk_radio_button_group (GTK_RADIO_BUTTON (NODIAG_1)); - gtk_object_set_data (GTK_OBJECT (gum), "NODIAG_1", NODIAG_1); + gtk_widget_ref (NODIAG_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "NODIAG_1", NODIAG_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (NODIAG_1); gtk_box_pack_start (GTK_BOX (hbox28), NODIAG_1, FALSE, FALSE, 0); hbox27 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox27", hbox27); + gtk_widget_ref (hbox27); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox27", hbox27, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox27); gtk_table_attach (GTK_TABLE (table4), hbox27, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -1740,18 +2113,24 @@ RESETGALAXY_0 = gtk_radio_button_new_with_label (RESETGALAXY_group, "No"); RESETGALAXY_group = gtk_radio_button_group (GTK_RADIO_BUTTON (RESETGALAXY_0)); - gtk_object_set_data (GTK_OBJECT (gum), "RESETGALAXY_0", RESETGALAXY_0); + gtk_widget_ref (RESETGALAXY_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "RESETGALAXY_0", RESETGALAXY_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (RESETGALAXY_0); gtk_box_pack_start (GTK_BOX (hbox27), RESETGALAXY_0, FALSE, FALSE, 0); RESETGALAXY_1 = gtk_radio_button_new_with_label (RESETGALAXY_group, "Yes"); RESETGALAXY_group = gtk_radio_button_group (GTK_RADIO_BUTTON (RESETGALAXY_1)); - gtk_object_set_data (GTK_OBJECT (gum), "RESETGALAXY_1", RESETGALAXY_1); + gtk_widget_ref (RESETGALAXY_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "RESETGALAXY_1", RESETGALAXY_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (RESETGALAXY_1); gtk_box_pack_start (GTK_BOX (hbox27), RESETGALAXY_1, FALSE, FALSE, 0); hbox26 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox26", hbox26); + gtk_widget_ref (hbox26); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox26", hbox26, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox26); gtk_table_attach (GTK_TABLE (table4), hbox26, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -1759,126 +2138,197 @@ HUNTERKILLER_0 = gtk_radio_button_new_with_label (HUNTERKILLER_group, "No"); HUNTERKILLER_group = gtk_radio_button_group (GTK_RADIO_BUTTON (HUNTERKILLER_0)); - gtk_object_set_data (GTK_OBJECT (gum), "HUNTERKILLER_0", HUNTERKILLER_0); + gtk_widget_ref (HUNTERKILLER_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "HUNTERKILLER_0", HUNTERKILLER_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (HUNTERKILLER_0); gtk_box_pack_start (GTK_BOX (hbox26), HUNTERKILLER_0, FALSE, FALSE, 0); HUNTERKILLER_1 = gtk_radio_button_new_with_label (HUNTERKILLER_group, "Yes"); HUNTERKILLER_group = gtk_radio_button_group (GTK_RADIO_BUTTON (HUNTERKILLER_1)); - gtk_object_set_data (GTK_OBJECT (gum), "HUNTERKILLER_1", HUNTERKILLER_1); + gtk_widget_ref (HUNTERKILLER_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "HUNTERKILLER_1", HUNTERKILLER_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (HUNTERKILLER_1); gtk_box_pack_start (GTK_BOX (hbox26), HUNTERKILLER_1, FALSE, FALSE, 0); hbox30 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox30", hbox30); + gtk_widget_ref (hbox30); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox30", hbox30, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox30); - gtk_table_attach (GTK_TABLE (table4), hbox30, 1, 2, 10, 11, + gtk_table_attach (GTK_TABLE (table4), hbox30, 1, 2, 11, 12, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); NEWTURN_0 = gtk_radio_button_new_with_label (NEWTURN_group, "No"); NEWTURN_group = gtk_radio_button_group (GTK_RADIO_BUTTON (NEWTURN_0)); - gtk_object_set_data (GTK_OBJECT (gum), "NEWTURN_0", NEWTURN_0); + gtk_widget_ref (NEWTURN_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "NEWTURN_0", NEWTURN_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (NEWTURN_0); gtk_box_pack_start (GTK_BOX (hbox30), NEWTURN_0, FALSE, FALSE, 0); NEWTURN_1 = gtk_radio_button_new_with_label (NEWTURN_group, "Yes"); NEWTURN_group = gtk_radio_button_group (GTK_RADIO_BUTTON (NEWTURN_1)); - gtk_object_set_data (GTK_OBJECT (gum), "NEWTURN_1", NEWTURN_1); + gtk_widget_ref (NEWTURN_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "NEWTURN_1", NEWTURN_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (NEWTURN_1); gtk_box_pack_start (GTK_BOX (hbox30), NEWTURN_1, FALSE, FALSE, 0); hbox31 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox31", hbox31); + gtk_widget_ref (hbox31); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox31", hbox31, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox31); - gtk_table_attach (GTK_TABLE (table4), hbox31, 1, 2, 13, 14, + gtk_table_attach (GTK_TABLE (table4), hbox31, 1, 2, 14, 15, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); TRANSWARP_0 = gtk_radio_button_new_with_label (TRANSWARP_group, "No"); TRANSWARP_group = gtk_radio_button_group (GTK_RADIO_BUTTON (TRANSWARP_0)); - gtk_object_set_data (GTK_OBJECT (gum), "TRANSWARP_0", TRANSWARP_0); + gtk_widget_ref (TRANSWARP_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "TRANSWARP_0", TRANSWARP_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (TRANSWARP_0); gtk_box_pack_start (GTK_BOX (hbox31), TRANSWARP_0, FALSE, FALSE, 0); TRANSWARP_1 = gtk_radio_button_new_with_label (TRANSWARP_group, "Yes"); TRANSWARP_group = gtk_radio_button_group (GTK_RADIO_BUTTON (TRANSWARP_1)); - gtk_object_set_data (GTK_OBJECT (gum), "TRANSWARP_1", TRANSWARP_1); + gtk_widget_ref (TRANSWARP_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "TRANSWARP_1", TRANSWARP_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (TRANSWARP_1); gtk_box_pack_start (GTK_BOX (hbox31), TRANSWARP_1, FALSE, FALSE, 0); hbox32 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox32", hbox32); + gtk_widget_ref (hbox32); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox32", hbox32, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox32); - gtk_table_attach (GTK_TABLE (table4), hbox32, 1, 2, 15, 16, + gtk_table_attach (GTK_TABLE (table4), hbox32, 1, 2, 16, 17, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); VECTOR_0 = gtk_radio_button_new_with_label (VECTOR_group, "No"); VECTOR_group = gtk_radio_button_group (GTK_RADIO_BUTTON (VECTOR_0)); - gtk_object_set_data (GTK_OBJECT (gum), "VECTOR_0", VECTOR_0); + gtk_widget_ref (VECTOR_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "VECTOR_0", VECTOR_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (VECTOR_0); gtk_box_pack_start (GTK_BOX (hbox32), VECTOR_0, FALSE, FALSE, 0); gtk_widget_set_sensitive (VECTOR_0, FALSE); VECTOR_1 = gtk_radio_button_new_with_label (VECTOR_group, "Yes"); VECTOR_group = gtk_radio_button_group (GTK_RADIO_BUTTON (VECTOR_1)); - gtk_object_set_data (GTK_OBJECT (gum), "VECTOR_1", VECTOR_1); + gtk_widget_ref (VECTOR_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "VECTOR_1", VECTOR_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (VECTOR_1); gtk_box_pack_start (GTK_BOX (hbox32), VECTOR_1, FALSE, FALSE, 0); gtk_widget_set_sensitive (VECTOR_1, FALSE); hbox10 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox10", hbox10); + gtk_widget_ref (hbox10); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox10", hbox10, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox10); - gtk_table_attach (GTK_TABLE (table4), hbox10, 1, 2, 11, 12, + gtk_table_attach (GTK_TABLE (table4), hbox10, 1, 2, 12, 13, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); HIDDEN_0 = gtk_radio_button_new_with_label (HIDDEN_group, "No"); HIDDEN_group = gtk_radio_button_group (GTK_RADIO_BUTTON (HIDDEN_0)); - gtk_object_set_data (GTK_OBJECT (gum), "HIDDEN_0", HIDDEN_0); + gtk_widget_ref (HIDDEN_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "HIDDEN_0", HIDDEN_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (HIDDEN_0); gtk_box_pack_start (GTK_BOX (hbox10), HIDDEN_0, FALSE, FALSE, 0); HIDDEN_1 = gtk_radio_button_new_with_label (HIDDEN_group, "Yes"); HIDDEN_group = gtk_radio_button_group (GTK_RADIO_BUTTON (HIDDEN_1)); - gtk_object_set_data (GTK_OBJECT (gum), "HIDDEN_1", HIDDEN_1); + gtk_widget_ref (HIDDEN_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "HIDDEN_1", HIDDEN_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (HIDDEN_1); gtk_box_pack_start (GTK_BOX (hbox10), HIDDEN_1, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (HIDDEN_1), TRUE); SURRSTART = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (2, 0, 10, 1, 0, 0))); - gtk_object_set_data (GTK_OBJECT (gum), "SURRSTART", SURRSTART); + gtk_widget_ref (SURRSTART); + gtk_object_set_data_full (GTK_OBJECT (gum), "SURRSTART", SURRSTART, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SURRSTART); - gtk_table_attach (GTK_TABLE (table4), SURRSTART, 1, 2, 12, 13, + gtk_table_attach (GTK_TABLE (table4), SURRSTART, 1, 2, 13, 14, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); gtk_scale_set_digits (GTK_SCALE (SURRSTART), 0); WARPSPEED_adj = gtk_adjustment_new (60, 0, 100, 1, 10, 10); WARPSPEED = gtk_spin_button_new (GTK_ADJUSTMENT (WARPSPEED_adj), 1, 0); - gtk_object_set_data (GTK_OBJECT (gum), "WARPSPEED", WARPSPEED); + gtk_widget_ref (WARPSPEED); + gtk_object_set_data_full (GTK_OBJECT (gum), "WARPSPEED", WARPSPEED, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (WARPSPEED); - gtk_table_attach (GTK_TABLE (table4), WARPSPEED, 1, 2, 14, 15, + gtk_table_attach (GTK_TABLE (table4), WARPSPEED, 1, 2, 15, 16, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (WARPSPEED), TRUE); SBRANK = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "SBRANK", SBRANK); + gtk_widget_ref (SBRANK); + gtk_object_set_data_full (GTK_OBJECT (gum), "SBRANK", SBRANK, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SBRANK); gtk_table_attach (GTK_TABLE (table4), SBRANK, 1, 2, 7, 8, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); + SBRANK_LABEL = gtk_label_new ("Rank required before refit to Stabase:"); + gtk_widget_ref (SBRANK_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "SBRANK_LABEL", SBRANK_LABEL, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (SBRANK_LABEL); + gtk_table_attach (GTK_TABLE (table4), SBRANK_LABEL, 0, 1, 7, 8, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + gtk_misc_set_alignment (GTK_MISC (SBRANK_LABEL), 1, 0.5); + gtk_misc_set_padding (GTK_MISC (SBRANK_LABEL), 10, 0); + + SBPLANETS_LABEL = gtk_label_new ("SBPLANETS"); + gtk_widget_ref (SBPLANETS_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "SBPLANETS_LABEL", SBPLANETS_LABEL, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (SBPLANETS_LABEL); + gtk_table_attach (GTK_TABLE (table4), SBPLANETS_LABEL, 0, 1, 8, 9, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + gtk_label_set_justify (GTK_LABEL (SBPLANETS_LABEL), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (SBPLANETS_LABEL), 1, 0.5); + gtk_misc_set_padding (GTK_MISC (SBPLANETS_LABEL), 10, 0); + + SBPLANETS = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (5, 1, 20, 1, 0, 0))); + gtk_widget_ref (SBPLANETS); + gtk_object_set_data_full (GTK_OBJECT (gum), "SBPLANETS", SBPLANETS, + (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (SBPLANETS); + gtk_table_attach (GTK_TABLE (table4), SBPLANETS, 1, 2, 8, 9, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (GTK_FILL), 0, 0); + gtk_scale_set_digits (GTK_SCALE (SBPLANETS), 0); + label6 = gtk_label_new ("Style"); - gtk_object_set_data (GTK_OBJECT (gum), "label6", label6); + gtk_widget_ref (label6); + gtk_object_set_data_full (GTK_OBJECT (gum), "label6", label6, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label6); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 3), label6); table2 = gtk_table_new (4, 2, FALSE); - gtk_object_set_data (GTK_OBJECT (gum), "table2", table2); + gtk_widget_ref (table2); + gtk_object_set_data_full (GTK_OBJECT (gum), "table2", table2, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (table2); gtk_container_add (GTK_CONTAINER (notebook1), table2); gtk_container_set_border_width (GTK_CONTAINER (table2), 6); @@ -1886,21 +2336,27 @@ gtk_table_set_col_spacings (GTK_TABLE (table2), 6); label70 = gtk_label_new ("Clue Checking Settings\n"); - gtk_object_set_data (GTK_OBJECT (gum), "label70", label70); + gtk_widget_ref (label70); + gtk_object_set_data_full (GTK_OBJECT (gum), "label70", label70, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label70); gtk_table_attach (GTK_TABLE (table2), label70, 0, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); label74 = gtk_label_new (""); - gtk_object_set_data (GTK_OBJECT (gum), "label74", label74); + gtk_widget_ref (label74); + gtk_object_set_data_full (GTK_OBJECT (gum), "label74", label74, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label74); gtk_table_attach (GTK_TABLE (table2), label74, 0, 2, 3, 4, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); CLUE_LABEL = gtk_label_new ("CLUE:"); - gtk_object_set_data (GTK_OBJECT (gum), "CLUE_LABEL", CLUE_LABEL); + gtk_widget_ref (CLUE_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "CLUE_LABEL", CLUE_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CLUE_LABEL); gtk_table_attach (GTK_TABLE (table2), CLUE_LABEL, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -1909,7 +2365,9 @@ gtk_misc_set_padding (GTK_MISC (CLUE_LABEL), 10, 0); CLUERANK_LABEL = gtk_label_new ("CLUERANK:"); - gtk_object_set_data (GTK_OBJECT (gum), "CLUERANK_LABEL", CLUERANK_LABEL); + gtk_widget_ref (CLUERANK_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "CLUERANK_LABEL", CLUERANK_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CLUERANK_LABEL); gtk_table_attach (GTK_TABLE (table2), CLUERANK_LABEL, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -1918,7 +2376,9 @@ gtk_misc_set_padding (GTK_MISC (CLUERANK_LABEL), 10, 0); hbox33 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox33", hbox33); + gtk_widget_ref (hbox33); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox33", hbox33, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox33); gtk_table_attach (GTK_TABLE (table2), hbox33, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -1926,36 +2386,48 @@ CLUE_0 = gtk_radio_button_new_with_label (CLUE_group, "None"); CLUE_group = gtk_radio_button_group (GTK_RADIO_BUTTON (CLUE_0)); - gtk_object_set_data (GTK_OBJECT (gum), "CLUE_0", CLUE_0); + gtk_widget_ref (CLUE_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "CLUE_0", CLUE_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CLUE_0); gtk_box_pack_start (GTK_BOX (hbox33), CLUE_0, FALSE, FALSE, 0); CLUE_1 = gtk_radio_button_new_with_label (CLUE_group, "Keyword"); CLUE_group = gtk_radio_button_group (GTK_RADIO_BUTTON (CLUE_1)); - gtk_object_set_data (GTK_OBJECT (gum), "CLUE_1", CLUE_1); + gtk_widget_ref (CLUE_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "CLUE_1", CLUE_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CLUE_1); gtk_box_pack_start (GTK_BOX (hbox33), CLUE_1, FALSE, FALSE, 0); CLUE_2 = gtk_radio_button_new_with_label (CLUE_group, "Question & Answer"); CLUE_group = gtk_radio_button_group (GTK_RADIO_BUTTON (CLUE_2)); - gtk_object_set_data (GTK_OBJECT (gum), "CLUE_2", CLUE_2); + gtk_widget_ref (CLUE_2); + gtk_object_set_data_full (GTK_OBJECT (gum), "CLUE_2", CLUE_2, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CLUE_2); gtk_box_pack_start (GTK_BOX (hbox33), CLUE_2, FALSE, FALSE, 0); CLUERANK = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "CLUERANK", CLUERANK); + gtk_widget_ref (CLUERANK); + gtk_object_set_data_full (GTK_OBJECT (gum), "CLUERANK", CLUERANK, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CLUERANK); gtk_table_attach (GTK_TABLE (table2), CLUERANK, 1, 2, 2, 3, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); label2 = gtk_label_new ("Clue Check"); - gtk_object_set_data (GTK_OBJECT (gum), "label2", label2); + gtk_widget_ref (label2); + gtk_object_set_data_full (GTK_OBJECT (gum), "label2", label2, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label2); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 4), label2); table5 = gtk_table_new (10, 2, FALSE); - gtk_object_set_data (GTK_OBJECT (gum), "table5", table5); + gtk_widget_ref (table5); + gtk_object_set_data_full (GTK_OBJECT (gum), "table5", table5, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (table5); gtk_container_add (GTK_CONTAINER (notebook1), table5); gtk_container_set_border_width (GTK_CONTAINER (table5), 6); @@ -1963,21 +2435,27 @@ gtk_table_set_col_spacings (GTK_TABLE (table5), 6); label104 = gtk_label_new ("Messaging Settings\n"); - gtk_object_set_data (GTK_OBJECT (gum), "label104", label104); + gtk_widget_ref (label104); + gtk_object_set_data_full (GTK_OBJECT (gum), "label104", label104, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label104); gtk_table_attach (GTK_TABLE (table5), label104, 0, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); label105 = gtk_label_new (""); - gtk_object_set_data (GTK_OBJECT (gum), "label105", label105); + gtk_widget_ref (label105); + gtk_object_set_data_full (GTK_OBJECT (gum), "label105", label105, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label105); gtk_table_attach (GTK_TABLE (table5), label105, 0, 2, 9, 10, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); CHECKMESG_LABEL = gtk_label_new ("CHECKMESG:"); - gtk_object_set_data (GTK_OBJECT (gum), "CHECKMESG_LABEL", CHECKMESG_LABEL); + gtk_widget_ref (CHECKMESG_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "CHECKMESG_LABEL", CHECKMESG_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CHECKMESG_LABEL); gtk_table_attach (GTK_TABLE (table5), CHECKMESG_LABEL, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -1986,7 +2464,9 @@ gtk_misc_set_padding (GTK_MISC (CHECKMESG_LABEL), 10, 0); LOGALL_LABEL = gtk_label_new ("LOGALL:"); - gtk_object_set_data (GTK_OBJECT (gum), "LOGALL_LABEL", LOGALL_LABEL); + gtk_widget_ref (LOGALL_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "LOGALL_LABEL", LOGALL_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (LOGALL_LABEL); gtk_table_attach (GTK_TABLE (table5), LOGALL_LABEL, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -1995,7 +2475,9 @@ gtk_misc_set_padding (GTK_MISC (LOGALL_LABEL), 10, 0); LOGGOD_LABEL = gtk_label_new ("LOGGOD:"); - gtk_object_set_data (GTK_OBJECT (gum), "LOGGOD_LABEL", LOGGOD_LABEL); + gtk_widget_ref (LOGGOD_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "LOGGOD_LABEL", LOGGOD_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (LOGGOD_LABEL); gtk_table_attach (GTK_TABLE (table5), LOGGOD_LABEL, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -2004,7 +2486,9 @@ gtk_misc_set_padding (GTK_MISC (LOGGOD_LABEL), 10, 0); EVENTLOG_LABEL = gtk_label_new ("EVENTLOG:"); - gtk_object_set_data (GTK_OBJECT (gum), "EVENTLOG_LABEL", EVENTLOG_LABEL); + gtk_widget_ref (EVENTLOG_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "EVENTLOG_LABEL", EVENTLOG_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (EVENTLOG_LABEL); gtk_table_attach (GTK_TABLE (table5), EVENTLOG_LABEL, 0, 1, 4, 5, (GtkAttachOptions) (GTK_FILL), @@ -2013,7 +2497,9 @@ gtk_misc_set_padding (GTK_MISC (EVENTLOG_LABEL), 10, 0); DOOSHER_LABEL = gtk_label_new ("DOOSHER:"); - gtk_object_set_data (GTK_OBJECT (gum), "DOOSHER_LABEL", DOOSHER_LABEL); + gtk_widget_ref (DOOSHER_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "DOOSHER_LABEL", DOOSHER_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (DOOSHER_LABEL); gtk_table_attach (GTK_TABLE (table5), DOOSHER_LABEL, 0, 1, 5, 6, (GtkAttachOptions) (GTK_FILL), @@ -2022,7 +2508,9 @@ gtk_misc_set_padding (GTK_MISC (DOOSHER_LABEL), 10, 0); CHECKSCUM_LABEL = gtk_label_new ("CHECKSCUM:"); - gtk_object_set_data (GTK_OBJECT (gum), "CHECKSCUM_LABEL", CHECKSCUM_LABEL); + gtk_widget_ref (CHECKSCUM_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "CHECKSCUM_LABEL", CHECKSCUM_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CHECKSCUM_LABEL); gtk_table_attach (GTK_TABLE (table5), CHECKSCUM_LABEL, 0, 1, 6, 7, (GtkAttachOptions) (GTK_FILL), @@ -2031,7 +2519,9 @@ gtk_misc_set_padding (GTK_MISC (CHECKSCUM_LABEL), 10, 0); WHYMESS_LABEL = gtk_label_new ("WHYMESS:"); - gtk_object_set_data (GTK_OBJECT (gum), "WHYMESS_LABEL", WHYMESS_LABEL); + gtk_widget_ref (WHYMESS_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "WHYMESS_LABEL", WHYMESS_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (WHYMESS_LABEL); gtk_table_attach (GTK_TABLE (table5), WHYMESS_LABEL, 0, 1, 7, 8, (GtkAttachOptions) (GTK_FILL), @@ -2039,8 +2529,12 @@ gtk_misc_set_alignment (GTK_MISC (WHYMESS_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (WHYMESS_LABEL), 10, 0); - ERROR_LEVEL_LABEL = gtk_label_new ("ERRORLEVEL:"); - gtk_object_set_data (GTK_OBJECT (gum), "ERROR_LEVEL_LABEL", ERROR_LEVEL_LABEL); + ERROR_LEVEL_LABEL = gtk_label_new (""); + gtk_label_parse_uline (GTK_LABEL (ERROR_LEVEL_LABEL), + "ERROR_LEVEL:"); + gtk_widget_ref (ERROR_LEVEL_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "ERROR_LEVEL_LABEL", ERROR_LEVEL_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (ERROR_LEVEL_LABEL); gtk_table_attach (GTK_TABLE (table5), ERROR_LEVEL_LABEL, 0, 1, 8, 9, (GtkAttachOptions) (GTK_FILL), @@ -2049,7 +2543,9 @@ gtk_misc_set_padding (GTK_MISC (ERROR_LEVEL_LABEL), 10, 0); hbox36 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox36", hbox36); + gtk_widget_ref (hbox36); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox36", hbox36, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox36); gtk_table_attach (GTK_TABLE (table5), hbox36, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -2057,18 +2553,24 @@ LOGGOD_0 = gtk_radio_button_new_with_label (LOGGOD_group, "No"); LOGGOD_group = gtk_radio_button_group (GTK_RADIO_BUTTON (LOGGOD_0)); - gtk_object_set_data (GTK_OBJECT (gum), "LOGGOD_0", LOGGOD_0); + gtk_widget_ref (LOGGOD_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "LOGGOD_0", LOGGOD_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (LOGGOD_0); gtk_box_pack_start (GTK_BOX (hbox36), LOGGOD_0, FALSE, FALSE, 0); LOGGOD_1 = gtk_radio_button_new_with_label (LOGGOD_group, "Yes"); LOGGOD_group = gtk_radio_button_group (GTK_RADIO_BUTTON (LOGGOD_1)); - gtk_object_set_data (GTK_OBJECT (gum), "LOGGOD_1", LOGGOD_1); + gtk_widget_ref (LOGGOD_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "LOGGOD_1", LOGGOD_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (LOGGOD_1); gtk_box_pack_start (GTK_BOX (hbox36), LOGGOD_1, FALSE, FALSE, 0); hbox35 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox35", hbox35); + gtk_widget_ref (hbox35); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox35", hbox35, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox35); gtk_table_attach (GTK_TABLE (table5), hbox35, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -2076,18 +2578,24 @@ LOGALL_0 = gtk_radio_button_new_with_label (LOGALL_group, "No"); LOGALL_group = gtk_radio_button_group (GTK_RADIO_BUTTON (LOGALL_0)); - gtk_object_set_data (GTK_OBJECT (gum), "LOGALL_0", LOGALL_0); + gtk_widget_ref (LOGALL_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "LOGALL_0", LOGALL_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (LOGALL_0); gtk_box_pack_start (GTK_BOX (hbox35), LOGALL_0, FALSE, FALSE, 0); LOGALL_1 = gtk_radio_button_new_with_label (LOGALL_group, "Yes"); LOGALL_group = gtk_radio_button_group (GTK_RADIO_BUTTON (LOGALL_1)); - gtk_object_set_data (GTK_OBJECT (gum), "LOGALL_1", LOGALL_1); + gtk_widget_ref (LOGALL_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "LOGALL_1", LOGALL_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (LOGALL_1); gtk_box_pack_start (GTK_BOX (hbox35), LOGALL_1, FALSE, FALSE, 0); hbox34 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox34", hbox34); + gtk_widget_ref (hbox34); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox34", hbox34, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox34); gtk_table_attach (GTK_TABLE (table5), hbox34, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -2095,18 +2603,24 @@ CHECKMESG_0 = gtk_radio_button_new_with_label (CHECKMESG_group, "No"); CHECKMESG_group = gtk_radio_button_group (GTK_RADIO_BUTTON (CHECKMESG_0)); - gtk_object_set_data (GTK_OBJECT (gum), "CHECKMESG_0", CHECKMESG_0); + gtk_widget_ref (CHECKMESG_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "CHECKMESG_0", CHECKMESG_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CHECKMESG_0); gtk_box_pack_start (GTK_BOX (hbox34), CHECKMESG_0, FALSE, FALSE, 0); CHECKMESG_1 = gtk_radio_button_new_with_label (CHECKMESG_group, "Yes"); CHECKMESG_group = gtk_radio_button_group (GTK_RADIO_BUTTON (CHECKMESG_1)); - gtk_object_set_data (GTK_OBJECT (gum), "CHECKMESG_1", CHECKMESG_1); + gtk_widget_ref (CHECKMESG_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "CHECKMESG_1", CHECKMESG_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CHECKMESG_1); gtk_box_pack_start (GTK_BOX (hbox34), CHECKMESG_1, FALSE, FALSE, 0); hbox37 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox37", hbox37); + gtk_widget_ref (hbox37); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox37", hbox37, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox37); gtk_table_attach (GTK_TABLE (table5), hbox37, 1, 2, 4, 5, (GtkAttachOptions) (GTK_FILL), @@ -2114,18 +2628,24 @@ EVENTLOG_0 = gtk_radio_button_new_with_label (EVENTLOG_group, "No"); EVENTLOG_group = gtk_radio_button_group (GTK_RADIO_BUTTON (EVENTLOG_0)); - gtk_object_set_data (GTK_OBJECT (gum), "EVENTLOG_0", EVENTLOG_0); + gtk_widget_ref (EVENTLOG_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "EVENTLOG_0", EVENTLOG_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (EVENTLOG_0); gtk_box_pack_start (GTK_BOX (hbox37), EVENTLOG_0, FALSE, FALSE, 0); EVENTLOG_1 = gtk_radio_button_new_with_label (EVENTLOG_group, "Yes"); EVENTLOG_group = gtk_radio_button_group (GTK_RADIO_BUTTON (EVENTLOG_1)); - gtk_object_set_data (GTK_OBJECT (gum), "EVENTLOG_1", EVENTLOG_1); + gtk_widget_ref (EVENTLOG_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "EVENTLOG_1", EVENTLOG_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (EVENTLOG_1); gtk_box_pack_start (GTK_BOX (hbox37), EVENTLOG_1, FALSE, FALSE, 0); hbox38 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox38", hbox38); + gtk_widget_ref (hbox38); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox38", hbox38, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox38); gtk_table_attach (GTK_TABLE (table5), hbox38, 1, 2, 5, 6, (GtkAttachOptions) (GTK_FILL), @@ -2133,18 +2653,24 @@ DOOSHER_0 = gtk_radio_button_new_with_label (DOOSHER_group, "No"); DOOSHER_group = gtk_radio_button_group (GTK_RADIO_BUTTON (DOOSHER_0)); - gtk_object_set_data (GTK_OBJECT (gum), "DOOSHER_0", DOOSHER_0); + gtk_widget_ref (DOOSHER_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "DOOSHER_0", DOOSHER_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (DOOSHER_0); gtk_box_pack_start (GTK_BOX (hbox38), DOOSHER_0, FALSE, FALSE, 0); DOOSHER_1 = gtk_radio_button_new_with_label (DOOSHER_group, "Yes"); DOOSHER_group = gtk_radio_button_group (GTK_RADIO_BUTTON (DOOSHER_1)); - gtk_object_set_data (GTK_OBJECT (gum), "DOOSHER_1", DOOSHER_1); + gtk_widget_ref (DOOSHER_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "DOOSHER_1", DOOSHER_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (DOOSHER_1); gtk_box_pack_start (GTK_BOX (hbox38), DOOSHER_1, FALSE, FALSE, 0); hbox39 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox39", hbox39); + gtk_widget_ref (hbox39); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox39", hbox39, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox39); gtk_table_attach (GTK_TABLE (table5), hbox39, 1, 2, 6, 7, (GtkAttachOptions) (GTK_FILL), @@ -2152,18 +2678,24 @@ CHECKSCUM_0 = gtk_radio_button_new_with_label (CHECKSCUM_group, "No"); CHECKSCUM_group = gtk_radio_button_group (GTK_RADIO_BUTTON (CHECKSCUM_0)); - gtk_object_set_data (GTK_OBJECT (gum), "CHECKSCUM_0", CHECKSCUM_0); + gtk_widget_ref (CHECKSCUM_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "CHECKSCUM_0", CHECKSCUM_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CHECKSCUM_0); gtk_box_pack_start (GTK_BOX (hbox39), CHECKSCUM_0, FALSE, FALSE, 0); CHECKSCUM_1 = gtk_radio_button_new_with_label (CHECKSCUM_group, "Yes"); CHECKSCUM_group = gtk_radio_button_group (GTK_RADIO_BUTTON (CHECKSCUM_1)); - gtk_object_set_data (GTK_OBJECT (gum), "CHECKSCUM_1", CHECKSCUM_1); + gtk_widget_ref (CHECKSCUM_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "CHECKSCUM_1", CHECKSCUM_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CHECKSCUM_1); gtk_box_pack_start (GTK_BOX (hbox39), CHECKSCUM_1, FALSE, FALSE, 0); hbox40 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox40", hbox40); + gtk_widget_ref (hbox40); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox40", hbox40, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox40); gtk_table_attach (GTK_TABLE (table5), hbox40, 1, 2, 7, 8, (GtkAttachOptions) (GTK_FILL), @@ -2171,18 +2703,24 @@ WHYMESS_0 = gtk_radio_button_new_with_label (WHYMESS_group, "No"); WHYMESS_group = gtk_radio_button_group (GTK_RADIO_BUTTON (WHYMESS_0)); - gtk_object_set_data (GTK_OBJECT (gum), "WHYMESS_0", WHYMESS_0); + gtk_widget_ref (WHYMESS_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "WHYMESS_0", WHYMESS_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (WHYMESS_0); gtk_box_pack_start (GTK_BOX (hbox40), WHYMESS_0, FALSE, FALSE, 0); WHYMESS_1 = gtk_radio_button_new_with_label (WHYMESS_group, "Yes"); WHYMESS_group = gtk_radio_button_group (GTK_RADIO_BUTTON (WHYMESS_1)); - gtk_object_set_data (GTK_OBJECT (gum), "WHYMESS_1", WHYMESS_1); + gtk_widget_ref (WHYMESS_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "WHYMESS_1", WHYMESS_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (WHYMESS_1); gtk_box_pack_start (GTK_BOX (hbox40), WHYMESS_1, FALSE, FALSE, 0); hbox41 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox41", hbox41); + gtk_widget_ref (hbox41); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox41", hbox41, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox41); gtk_table_attach (GTK_TABLE (table5), hbox41, 1, 2, 8, 9, (GtkAttachOptions) (GTK_FILL), @@ -2190,19 +2728,25 @@ ERROR_LEVEL_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10); ERROR_LEVEL = gtk_spin_button_new (GTK_ADJUSTMENT (ERROR_LEVEL_adj), 1, 0); - gtk_object_set_data (GTK_OBJECT (gum), "ERROR_LEVEL", ERROR_LEVEL); + gtk_widget_ref (ERROR_LEVEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "ERROR_LEVEL", ERROR_LEVEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (ERROR_LEVEL); gtk_box_pack_start (GTK_BOX (hbox41), ERROR_LEVEL, FALSE, FALSE, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (ERROR_LEVEL), TRUE); gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (ERROR_LEVEL), TRUE); label9 = gtk_label_new ("Messaging"); - gtk_object_set_data (GTK_OBJECT (gum), "label9", label9); + gtk_widget_ref (label9); + gtk_object_set_data_full (GTK_OBJECT (gum), "label9", label9, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label9); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 5), label9); table6 = gtk_table_new (7, 2, FALSE); - gtk_object_set_data (GTK_OBJECT (gum), "table6", table6); + gtk_widget_ref (table6); + gtk_object_set_data_full (GTK_OBJECT (gum), "table6", table6, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (table6); gtk_container_add (GTK_CONTAINER (notebook1), table6); gtk_container_set_border_width (GTK_CONTAINER (table6), 6); @@ -2210,14 +2754,18 @@ gtk_table_set_col_spacings (GTK_TABLE (table6), 6); label115 = gtk_label_new ("Galaxy and planet settings\n"); - gtk_object_set_data (GTK_OBJECT (gum), "label115", label115); + gtk_widget_ref (label115); + gtk_object_set_data_full (GTK_OBJECT (gum), "label115", label115, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label115); gtk_table_attach (GTK_TABLE (table6), label115, 0, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); hbox8 = gtk_hbox_new (FALSE, 6); - gtk_object_set_data (GTK_OBJECT (gum), "hbox8", hbox8); + gtk_widget_ref (hbox8); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox8", hbox8, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox8); gtk_table_attach (GTK_TABLE (table6), hbox8, 1, 2, 5, 6, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -2225,13 +2773,17 @@ gtk_container_set_border_width (GTK_CONTAINER (hbox8), 6); table13 = gtk_table_new (1, 2, FALSE); - gtk_object_set_data (GTK_OBJECT (gum), "table13", table13); + gtk_widget_ref (table13); + gtk_object_set_data_full (GTK_OBJECT (gum), "table13", table13, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (table13); gtk_box_pack_start (GTK_BOX (hbox8), table13, TRUE, TRUE, 0); START_ARMIES_adj = gtk_adjustment_new (17, 1, 100, 1, 10, 10); START_ARMIES = gtk_spin_button_new (GTK_ADJUSTMENT (START_ARMIES_adj), 1, 0); - gtk_object_set_data (GTK_OBJECT (gum), "START_ARMIES", START_ARMIES); + gtk_widget_ref (START_ARMIES); + gtk_object_set_data_full (GTK_OBJECT (gum), "START_ARMIES", START_ARMIES, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (START_ARMIES); gtk_table_attach (GTK_TABLE (table13), START_ARMIES, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -2240,19 +2792,25 @@ gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (START_ARMIES), TRUE); label120 = gtk_label_new (""); - gtk_object_set_data (GTK_OBJECT (gum), "label120", label120); + gtk_widget_ref (label120); + gtk_object_set_data_full (GTK_OBJECT (gum), "label120", label120, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label120); gtk_table_attach (GTK_TABLE (table13), label120, 1, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); label119 = gtk_label_new (""); - gtk_object_set_data (GTK_OBJECT (gum), "label119", label119); + gtk_widget_ref (label119); + gtk_object_set_data_full (GTK_OBJECT (gum), "label119", label119, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label119); gtk_box_pack_start (GTK_BOX (hbox8), label119, TRUE, TRUE, 0); table11 = gtk_table_new (4, 2, FALSE); - gtk_object_set_data (GTK_OBJECT (gum), "table11", table11); + gtk_widget_ref (table11); + gtk_object_set_data_full (GTK_OBJECT (gum), "table11", table11, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (table11); gtk_table_attach (GTK_TABLE (table6), table11, 1, 2, 4, 5, (GtkAttachOptions) (GTK_FILL), @@ -2262,7 +2820,9 @@ gtk_table_set_col_spacings (GTK_TABLE (table11), 6); PLANETS_1 = gtk_option_menu_new (); - gtk_object_set_data (GTK_OBJECT (gum), "PLANETS_1", PLANETS_1); + gtk_widget_ref (PLANETS_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "PLANETS_1", PLANETS_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PLANETS_1); gtk_table_attach (GTK_TABLE (table11), PLANETS_1, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -2303,7 +2863,9 @@ gtk_option_menu_set_menu (GTK_OPTION_MENU (PLANETS_1), PLANETS_1_menu); PLANETS_0 = gtk_option_menu_new (); - gtk_object_set_data (GTK_OBJECT (gum), "PLANETS_0", PLANETS_0); + gtk_widget_ref (PLANETS_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "PLANETS_0", PLANETS_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PLANETS_0); gtk_table_attach (GTK_TABLE (table11), PLANETS_0, 1, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -2341,7 +2903,9 @@ gtk_option_menu_set_menu (GTK_OPTION_MENU (PLANETS_0), PLANETS_0_menu); PLANETS_2 = gtk_option_menu_new (); - gtk_object_set_data (GTK_OBJECT (gum), "PLANETS_2", PLANETS_2); + gtk_widget_ref (PLANETS_2); + gtk_object_set_data_full (GTK_OBJECT (gum), "PLANETS_2", PLANETS_2, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PLANETS_2); gtk_table_attach (GTK_TABLE (table11), PLANETS_2, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -2382,7 +2946,9 @@ gtk_option_menu_set_menu (GTK_OPTION_MENU (PLANETS_2), PLANETS_2_menu); PLANETS_3 = gtk_option_menu_new (); - gtk_object_set_data (GTK_OBJECT (gum), "PLANETS_3", PLANETS_3); + gtk_widget_ref (PLANETS_3); + gtk_object_set_data_full (GTK_OBJECT (gum), "PLANETS_3", PLANETS_3, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PLANETS_3); gtk_table_attach (GTK_TABLE (table11), PLANETS_3, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -2423,7 +2989,9 @@ gtk_option_menu_set_menu (GTK_OPTION_MENU (PLANETS_3), PLANETS_3_menu); label64 = gtk_label_new ("Federation:"); - gtk_object_set_data (GTK_OBJECT (gum), "label64", label64); + gtk_widget_ref (label64); + gtk_object_set_data_full (GTK_OBJECT (gum), "label64", label64, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label64); gtk_table_attach (GTK_TABLE (table11), label64, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -2433,7 +3001,9 @@ gtk_misc_set_padding (GTK_MISC (label64), 10, 0); label65 = gtk_label_new ("Romulan:"); - gtk_object_set_data (GTK_OBJECT (gum), "label65", label65); + gtk_widget_ref (label65); + gtk_object_set_data_full (GTK_OBJECT (gum), "label65", label65, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label65); gtk_table_attach (GTK_TABLE (table11), label65, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -2443,7 +3013,9 @@ gtk_misc_set_padding (GTK_MISC (label65), 10, 0); label66 = gtk_label_new ("Klingon:"); - gtk_object_set_data (GTK_OBJECT (gum), "label66", label66); + gtk_widget_ref (label66); + gtk_object_set_data_full (GTK_OBJECT (gum), "label66", label66, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label66); gtk_table_attach (GTK_TABLE (table11), label66, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -2453,7 +3025,9 @@ gtk_misc_set_padding (GTK_MISC (label66), 10, 0); label67 = gtk_label_new ("Orion:"); - gtk_object_set_data (GTK_OBJECT (gum), "label67", label67); + gtk_widget_ref (label67); + gtk_object_set_data_full (GTK_OBJECT (gum), "label67", label67, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label67); gtk_table_attach (GTK_TABLE (table11), label67, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -2462,8 +3036,12 @@ gtk_misc_set_alignment (GTK_MISC (label67), 1, 0.5); gtk_misc_set_padding (GTK_MISC (label67), 10, 0); - MAX_POP_LABEL = gtk_label_new ("MAXPOP:"); - gtk_object_set_data (GTK_OBJECT (gum), "MAX_POP_LABEL", MAX_POP_LABEL); + MAX_POP_LABEL = gtk_label_new (""); + gtk_label_parse_uline (GTK_LABEL (MAX_POP_LABEL), + "MAX_POP:"); + gtk_widget_ref (MAX_POP_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "MAX_POP_LABEL", MAX_POP_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (MAX_POP_LABEL); gtk_table_attach (GTK_TABLE (table6), MAX_POP_LABEL, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -2471,8 +3049,12 @@ gtk_misc_set_alignment (GTK_MISC (MAX_POP_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (MAX_POP_LABEL), 10, 0); - PLANET_MOVE_LABEL = gtk_label_new ("PLANETMOVE:"); - gtk_object_set_data (GTK_OBJECT (gum), "PLANET_MOVE_LABEL", PLANET_MOVE_LABEL); + PLANET_MOVE_LABEL = gtk_label_new (""); + gtk_label_parse_uline (GTK_LABEL (PLANET_MOVE_LABEL), + "PLANET_MOVE:"); + gtk_widget_ref (PLANET_MOVE_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "PLANET_MOVE_LABEL", PLANET_MOVE_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PLANET_MOVE_LABEL); gtk_table_attach (GTK_TABLE (table6), PLANET_MOVE_LABEL, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -2480,8 +3062,12 @@ gtk_misc_set_alignment (GTK_MISC (PLANET_MOVE_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (PLANET_MOVE_LABEL), 10, 0); - WRAP_GALAXY_LABEL = gtk_label_new ("WRAPGALAXY:"); - gtk_object_set_data (GTK_OBJECT (gum), "WRAP_GALAXY_LABEL", WRAP_GALAXY_LABEL); + WRAP_GALAXY_LABEL = gtk_label_new (""); + gtk_label_parse_uline (GTK_LABEL (WRAP_GALAXY_LABEL), + "WRAP_GALAXY:"); + gtk_widget_ref (WRAP_GALAXY_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "WRAP_GALAXY_LABEL", WRAP_GALAXY_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (WRAP_GALAXY_LABEL); gtk_table_attach (GTK_TABLE (table6), WRAP_GALAXY_LABEL, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -2490,7 +3076,9 @@ gtk_misc_set_padding (GTK_MISC (WRAP_GALAXY_LABEL), 10, 0); PLANETS_LABEL_DISABLED = gtk_label_new ("PLANETS:"); - gtk_object_set_data (GTK_OBJECT (gum), "PLANETS_LABEL_DISABLED", PLANETS_LABEL_DISABLED); + gtk_widget_ref (PLANETS_LABEL_DISABLED); + gtk_object_set_data_full (GTK_OBJECT (gum), "PLANETS_LABEL_DISABLED", PLANETS_LABEL_DISABLED, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PLANETS_LABEL_DISABLED); gtk_table_attach (GTK_TABLE (table6), PLANETS_LABEL_DISABLED, 0, 1, 4, 5, (GtkAttachOptions) (GTK_FILL), @@ -2499,8 +3087,12 @@ gtk_misc_set_alignment (GTK_MISC (PLANETS_LABEL_DISABLED), 1, 0.1); gtk_misc_set_padding (GTK_MISC (PLANETS_LABEL_DISABLED), 10, 0); - START_ARMIES_LABEL = gtk_label_new ("STARTARMIES:"); - gtk_object_set_data (GTK_OBJECT (gum), "START_ARMIES_LABEL", START_ARMIES_LABEL); + START_ARMIES_LABEL = gtk_label_new (""); + gtk_label_parse_uline (GTK_LABEL (START_ARMIES_LABEL), + "START_ARMIES:"); + gtk_widget_ref (START_ARMIES_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "START_ARMIES_LABEL", START_ARMIES_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (START_ARMIES_LABEL); gtk_table_attach (GTK_TABLE (table6), START_ARMIES_LABEL, 0, 1, 5, 6, (GtkAttachOptions) (GTK_FILL), @@ -2509,14 +3101,18 @@ gtk_misc_set_padding (GTK_MISC (START_ARMIES_LABEL), 10, 0); label121 = gtk_label_new (""); - gtk_object_set_data (GTK_OBJECT (gum), "label121", label121); + gtk_widget_ref (label121); + gtk_object_set_data_full (GTK_OBJECT (gum), "label121", label121, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label121); gtk_table_attach (GTK_TABLE (table6), label121, 0, 2, 6, 7, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); hbox6 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox6", hbox6); + gtk_widget_ref (hbox6); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox6", hbox6, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox6); gtk_table_attach (GTK_TABLE (table6), hbox6, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -2524,18 +3120,24 @@ PLANET_MOVE_0 = gtk_radio_button_new_with_label (PLANET_MOVE_group, "No"); PLANET_MOVE_group = gtk_radio_button_group (GTK_RADIO_BUTTON (PLANET_MOVE_0)); - gtk_object_set_data (GTK_OBJECT (gum), "PLANET_MOVE_0", PLANET_MOVE_0); + gtk_widget_ref (PLANET_MOVE_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "PLANET_MOVE_0", PLANET_MOVE_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PLANET_MOVE_0); gtk_box_pack_start (GTK_BOX (hbox6), PLANET_MOVE_0, FALSE, FALSE, 0); PLANET_MOVE_1 = gtk_radio_button_new_with_label (PLANET_MOVE_group, "Yes"); PLANET_MOVE_group = gtk_radio_button_group (GTK_RADIO_BUTTON (PLANET_MOVE_1)); - gtk_object_set_data (GTK_OBJECT (gum), "PLANET_MOVE_1", PLANET_MOVE_1); + gtk_widget_ref (PLANET_MOVE_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "PLANET_MOVE_1", PLANET_MOVE_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PLANET_MOVE_1); gtk_box_pack_start (GTK_BOX (hbox6), PLANET_MOVE_1, FALSE, FALSE, 0); hbox7 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox7", hbox7); + gtk_widget_ref (hbox7); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox7", hbox7, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox7); gtk_table_attach (GTK_TABLE (table6), hbox7, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -2543,18 +3145,24 @@ WRAP_GALAXY_0 = gtk_radio_button_new_with_label (WRAP_GALAXY_group, "No"); WRAP_GALAXY_group = gtk_radio_button_group (GTK_RADIO_BUTTON (WRAP_GALAXY_0)); - gtk_object_set_data (GTK_OBJECT (gum), "WRAP_GALAXY_0", WRAP_GALAXY_0); + gtk_widget_ref (WRAP_GALAXY_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "WRAP_GALAXY_0", WRAP_GALAXY_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (WRAP_GALAXY_0); gtk_box_pack_start (GTK_BOX (hbox7), WRAP_GALAXY_0, FALSE, FALSE, 0); WRAP_GALAXY_01 = gtk_radio_button_new_with_label (WRAP_GALAXY_group, "Yes"); WRAP_GALAXY_group = gtk_radio_button_group (GTK_RADIO_BUTTON (WRAP_GALAXY_01)); - gtk_object_set_data (GTK_OBJECT (gum), "WRAP_GALAXY_01", WRAP_GALAXY_01); + gtk_widget_ref (WRAP_GALAXY_01); + gtk_object_set_data_full (GTK_OBJECT (gum), "WRAP_GALAXY_01", WRAP_GALAXY_01, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (WRAP_GALAXY_01); gtk_box_pack_start (GTK_BOX (hbox7), WRAP_GALAXY_01, FALSE, FALSE, 0); hbox5 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox5", hbox5); + gtk_widget_ref (hbox5); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox5", hbox5, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox5); gtk_table_attach (GTK_TABLE (table6), hbox5, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -2562,24 +3170,32 @@ MAX_POP_adj = gtk_adjustment_new (70, 0, 1000, 10, 10, 10); MAX_POP = gtk_spin_button_new (GTK_ADJUSTMENT (MAX_POP_adj), 1, 0); - gtk_object_set_data (GTK_OBJECT (gum), "MAX_POP", MAX_POP); + gtk_widget_ref (MAX_POP); + gtk_object_set_data_full (GTK_OBJECT (gum), "MAX_POP", MAX_POP, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (MAX_POP); gtk_box_pack_start (GTK_BOX (hbox5), MAX_POP, FALSE, FALSE, 6); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (MAX_POP), TRUE); gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (MAX_POP), TRUE); label116 = gtk_label_new (""); - gtk_object_set_data (GTK_OBJECT (gum), "label116", label116); + gtk_widget_ref (label116); + gtk_object_set_data_full (GTK_OBJECT (gum), "label116", label116, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label116); gtk_box_pack_start (GTK_BOX (hbox5), label116, FALSE, TRUE, 0); label17 = gtk_label_new ("Galaxy"); - gtk_object_set_data (GTK_OBJECT (gum), "label17", label17); + gtk_widget_ref (label17); + gtk_object_set_data_full (GTK_OBJECT (gum), "label17", label17, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label17); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 6), label17); table7 = gtk_table_new (4, 2, FALSE); - gtk_object_set_data (GTK_OBJECT (gum), "table7", table7); + gtk_widget_ref (table7); + gtk_object_set_data_full (GTK_OBJECT (gum), "table7", table7, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (table7); gtk_container_add (GTK_CONTAINER (notebook1), table7); gtk_container_set_border_width (GTK_CONTAINER (table7), 6); @@ -2587,14 +3203,18 @@ gtk_table_set_col_spacings (GTK_TABLE (table7), 6); label126 = gtk_label_new ("Base Practice Mode Settings\n"); - gtk_object_set_data (GTK_OBJECT (gum), "label126", label126); + gtk_widget_ref (label126); + gtk_object_set_data_full (GTK_OBJECT (gum), "label126", label126, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label126); gtk_table_attach (GTK_TABLE (table7), label126, 0, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); BASEPRACTICE_LABEL = gtk_label_new ("BASEPRACTICE:"); - gtk_object_set_data (GTK_OBJECT (gum), "BASEPRACTICE_LABEL", BASEPRACTICE_LABEL); + gtk_widget_ref (BASEPRACTICE_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "BASEPRACTICE_LABEL", BASEPRACTICE_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (BASEPRACTICE_LABEL); gtk_table_attach (GTK_TABLE (table7), BASEPRACTICE_LABEL, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -2603,7 +3223,9 @@ gtk_misc_set_padding (GTK_MISC (BASEPRACTICE_LABEL), 10, 0); ROBOTHOST_LABEL = gtk_label_new ("ROBOTHOST:"); - gtk_object_set_data (GTK_OBJECT (gum), "ROBOTHOST_LABEL", ROBOTHOST_LABEL); + gtk_widget_ref (ROBOTHOST_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "ROBOTHOST_LABEL", ROBOTHOST_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (ROBOTHOST_LABEL); gtk_table_attach (GTK_TABLE (table7), ROBOTHOST_LABEL, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -2612,7 +3234,9 @@ gtk_misc_set_padding (GTK_MISC (ROBOTHOST_LABEL), 10, 0); hbox42 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox42", hbox42); + gtk_widget_ref (hbox42); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox42", hbox42, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox42); gtk_table_attach (GTK_TABLE (table7), hbox42, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -2620,42 +3244,56 @@ BASEPRACTICE_0 = gtk_radio_button_new_with_label (BASEPRACTICE_group, "No"); BASEPRACTICE_group = gtk_radio_button_group (GTK_RADIO_BUTTON (BASEPRACTICE_0)); - gtk_object_set_data (GTK_OBJECT (gum), "BASEPRACTICE_0", BASEPRACTICE_0); + gtk_widget_ref (BASEPRACTICE_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "BASEPRACTICE_0", BASEPRACTICE_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (BASEPRACTICE_0); gtk_box_pack_start (GTK_BOX (hbox42), BASEPRACTICE_0, FALSE, FALSE, 0); BASEPRACTICE_1 = gtk_radio_button_new_with_label (BASEPRACTICE_group, "Yes"); BASEPRACTICE_group = gtk_radio_button_group (GTK_RADIO_BUTTON (BASEPRACTICE_1)); - gtk_object_set_data (GTK_OBJECT (gum), "BASEPRACTICE_1", BASEPRACTICE_1); + gtk_widget_ref (BASEPRACTICE_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "BASEPRACTICE_1", BASEPRACTICE_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (BASEPRACTICE_1); gtk_box_pack_start (GTK_BOX (hbox42), BASEPRACTICE_1, FALSE, FALSE, 0); hbox43 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox43", hbox43); + gtk_widget_ref (hbox43); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox43", hbox43, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox43); gtk_table_attach (GTK_TABLE (table7), hbox43, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); ROBOTHOST = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "ROBOTHOST", ROBOTHOST); + gtk_widget_ref (ROBOTHOST); + gtk_object_set_data_full (GTK_OBJECT (gum), "ROBOTHOST", ROBOTHOST, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (ROBOTHOST); gtk_box_pack_start (GTK_BOX (hbox43), ROBOTHOST, TRUE, TRUE, 0); label127 = gtk_label_new (""); - gtk_object_set_data (GTK_OBJECT (gum), "label127", label127); + gtk_widget_ref (label127); + gtk_object_set_data_full (GTK_OBJECT (gum), "label127", label127, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label127); gtk_table_attach (GTK_TABLE (table7), label127, 0, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); label51 = gtk_label_new ("Base Practice"); - gtk_object_set_data (GTK_OBJECT (gum), "label51", label51); + gtk_widget_ref (label51); + gtk_object_set_data_full (GTK_OBJECT (gum), "label51", label51, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label51); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 7), label51); table8 = gtk_table_new (3, 2, FALSE); - gtk_object_set_data (GTK_OBJECT (gum), "table8", table8); + gtk_widget_ref (table8); + gtk_object_set_data_full (GTK_OBJECT (gum), "table8", table8, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (table8); gtk_container_add (GTK_CONTAINER (notebook1), table8); gtk_container_set_border_width (GTK_CONTAINER (table8), 6); @@ -2663,14 +3301,18 @@ gtk_table_set_col_spacings (GTK_TABLE (table8), 6); label128 = gtk_label_new ("Hockey Mode Settings\n"); - gtk_object_set_data (GTK_OBJECT (gum), "label128", label128); + gtk_widget_ref (label128); + gtk_object_set_data_full (GTK_OBJECT (gum), "label128", label128, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label128); gtk_table_attach (GTK_TABLE (table8), label128, 0, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); HOCKEY_LABEL = gtk_label_new ("HOCKEY:"); - gtk_object_set_data (GTK_OBJECT (gum), "HOCKEY_LABEL", HOCKEY_LABEL); + gtk_widget_ref (HOCKEY_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "HOCKEY_LABEL", HOCKEY_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (HOCKEY_LABEL); gtk_table_attach (GTK_TABLE (table8), HOCKEY_LABEL, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -2679,7 +3321,9 @@ gtk_misc_set_padding (GTK_MISC (HOCKEY_LABEL), 10, 0); hbox44 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox44", hbox44); + gtk_widget_ref (hbox44); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox44", hbox44, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox44); gtk_table_attach (GTK_TABLE (table8), hbox44, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -2687,30 +3331,40 @@ HOCKEY_0 = gtk_radio_button_new_with_label (HOCKEY_group, "No"); HOCKEY_group = gtk_radio_button_group (GTK_RADIO_BUTTON (HOCKEY_0)); - gtk_object_set_data (GTK_OBJECT (gum), "HOCKEY_0", HOCKEY_0); + gtk_widget_ref (HOCKEY_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "HOCKEY_0", HOCKEY_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (HOCKEY_0); gtk_box_pack_start (GTK_BOX (hbox44), HOCKEY_0, FALSE, FALSE, 0); HOCKEY_1 = gtk_radio_button_new_with_label (HOCKEY_group, "Yes"); HOCKEY_group = gtk_radio_button_group (GTK_RADIO_BUTTON (HOCKEY_1)); - gtk_object_set_data (GTK_OBJECT (gum), "HOCKEY_1", HOCKEY_1); + gtk_widget_ref (HOCKEY_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "HOCKEY_1", HOCKEY_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (HOCKEY_1); gtk_box_pack_start (GTK_BOX (hbox44), HOCKEY_1, FALSE, FALSE, 0); label131 = gtk_label_new (""); - gtk_object_set_data (GTK_OBJECT (gum), "label131", label131); + gtk_widget_ref (label131); + gtk_object_set_data_full (GTK_OBJECT (gum), "label131", label131, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label131); gtk_table_attach (GTK_TABLE (table8), label131, 0, 2, 2, 3, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); label54 = gtk_label_new ("Hockey"); - gtk_object_set_data (GTK_OBJECT (gum), "label54", label54); + gtk_widget_ref (label54); + gtk_object_set_data_full (GTK_OBJECT (gum), "label54", label54, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label54); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 8), label54); table9 = gtk_table_new (4, 2, FALSE); - gtk_object_set_data (GTK_OBJECT (gum), "table9", table9); + gtk_widget_ref (table9); + gtk_object_set_data_full (GTK_OBJECT (gum), "table9", table9, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (table9); gtk_container_add (GTK_CONTAINER (notebook1), table9); gtk_container_set_border_width (GTK_CONTAINER (table9), 6); @@ -2718,7 +3372,9 @@ gtk_table_set_col_spacings (GTK_TABLE (table9), 6); hbox45 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox45", hbox45); + gtk_widget_ref (hbox45); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox45", hbox45, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox45); gtk_table_attach (GTK_TABLE (table9), hbox45, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -2726,32 +3382,42 @@ INL_0 = gtk_radio_button_new_with_label (INL_group, "No"); INL_group = gtk_radio_button_group (GTK_RADIO_BUTTON (INL_0)); - gtk_object_set_data (GTK_OBJECT (gum), "INL_0", INL_0); + gtk_widget_ref (INL_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "INL_0", INL_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (INL_0); gtk_box_pack_start (GTK_BOX (hbox45), INL_0, FALSE, FALSE, 0); INL_1 = gtk_radio_button_new_with_label (INL_group, "Yes"); INL_group = gtk_radio_button_group (GTK_RADIO_BUTTON (INL_1)); - gtk_object_set_data (GTK_OBJECT (gum), "INL_1", INL_1); + gtk_widget_ref (INL_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "INL_1", INL_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (INL_1); gtk_box_pack_start (GTK_BOX (hbox45), INL_1, FALSE, FALSE, 0); inl = gtk_label_new ("INL Server Settings\n"); - gtk_object_set_data (GTK_OBJECT (gum), "inl", inl); + gtk_widget_ref (inl); + gtk_object_set_data_full (GTK_OBJECT (gum), "inl", inl, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (inl); gtk_table_attach (GTK_TABLE (table9), inl, 0, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); label130 = gtk_label_new (""); - gtk_object_set_data (GTK_OBJECT (gum), "label130", label130); + gtk_widget_ref (label130); + gtk_object_set_data_full (GTK_OBJECT (gum), "label130", label130, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label130); gtk_table_attach (GTK_TABLE (table9), label130, 0, 2, 3, 4, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); INL_LABEL = gtk_label_new ("INL:"); - gtk_object_set_data (GTK_OBJECT (gum), "INL_LABEL", INL_LABEL); + gtk_widget_ref (INL_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "INL_LABEL", INL_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (INL_LABEL); gtk_table_attach (GTK_TABLE (table9), INL_LABEL, 0, 1, 1, 2, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -2759,8 +3425,12 @@ gtk_misc_set_alignment (GTK_MISC (INL_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (INL_LABEL), 10, 0); - INL_RECORD_LABEL = gtk_label_new ("INLRECORD:"); - gtk_object_set_data (GTK_OBJECT (gum), "INL_RECORD_LABEL", INL_RECORD_LABEL); + INL_RECORD_LABEL = gtk_label_new (""); + gtk_label_parse_uline (GTK_LABEL (INL_RECORD_LABEL), + "INL_RECORD:"); + gtk_widget_ref (INL_RECORD_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "INL_RECORD_LABEL", INL_RECORD_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (INL_RECORD_LABEL); gtk_table_attach (GTK_TABLE (table9), INL_RECORD_LABEL, 0, 1, 2, 3, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -2769,7 +3439,9 @@ gtk_misc_set_padding (GTK_MISC (INL_RECORD_LABEL), 10, 0); hbox55 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox55", hbox55); + gtk_widget_ref (hbox55); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox55", hbox55, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox55); gtk_table_attach (GTK_TABLE (table9), hbox55, 1, 2, 2, 3, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -2777,23 +3449,31 @@ INL_RECORD_0 = gtk_radio_button_new_with_label (INL_RECORD_group, "No"); INL_RECORD_group = gtk_radio_button_group (GTK_RADIO_BUTTON (INL_RECORD_0)); - gtk_object_set_data (GTK_OBJECT (gum), "INL_RECORD_0", INL_RECORD_0); + gtk_widget_ref (INL_RECORD_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "INL_RECORD_0", INL_RECORD_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (INL_RECORD_0); gtk_box_pack_start (GTK_BOX (hbox55), INL_RECORD_0, FALSE, FALSE, 0); INL_RECORD_1 = gtk_radio_button_new_with_label (INL_RECORD_group, "Yes"); INL_RECORD_group = gtk_radio_button_group (GTK_RADIO_BUTTON (INL_RECORD_1)); - gtk_object_set_data (GTK_OBJECT (gum), "INL_RECORD_1", INL_RECORD_1); + gtk_widget_ref (INL_RECORD_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "INL_RECORD_1", INL_RECORD_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (INL_RECORD_1); gtk_box_pack_start (GTK_BOX (hbox55), INL_RECORD_1, FALSE, FALSE, 0); INL_NOTEBOOK_LABEL = gtk_label_new ("INL"); - gtk_object_set_data (GTK_OBJECT (gum), "INL_NOTEBOOK_LABEL", INL_NOTEBOOK_LABEL); + gtk_widget_ref (INL_NOTEBOOK_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "INL_NOTEBOOK_LABEL", INL_NOTEBOOK_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (INL_NOTEBOOK_LABEL); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 9), INL_NOTEBOOK_LABEL); table10 = gtk_table_new (6, 2, FALSE); - gtk_object_set_data (GTK_OBJECT (gum), "table10", table10); + gtk_widget_ref (table10); + gtk_object_set_data_full (GTK_OBJECT (gum), "table10", table10, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (table10); gtk_container_add (GTK_CONTAINER (notebook1), table10); gtk_container_set_border_width (GTK_CONTAINER (table10), 6); @@ -2801,14 +3481,18 @@ gtk_table_set_col_spacings (GTK_TABLE (table10), 6); label124 = gtk_label_new ("Dogfight (Mars) Server Settings\n"); - gtk_object_set_data (GTK_OBJECT (gum), "label124", label124); + gtk_widget_ref (label124); + gtk_object_set_data_full (GTK_OBJECT (gum), "label124", label124, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label124); gtk_table_attach (GTK_TABLE (table10), label124, 0, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); DOGFIGHT_LABEL = gtk_label_new ("DOGFIGHT:"); - gtk_object_set_data (GTK_OBJECT (gum), "DOGFIGHT_LABEL", DOGFIGHT_LABEL); + gtk_widget_ref (DOGFIGHT_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "DOGFIGHT_LABEL", DOGFIGHT_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (DOGFIGHT_LABEL); gtk_table_attach (GTK_TABLE (table10), DOGFIGHT_LABEL, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -2817,7 +3501,9 @@ gtk_misc_set_padding (GTK_MISC (DOGFIGHT_LABEL), 10, 0); CONTESTSIZE_LABEL = gtk_label_new ("CONTESTSIZE:"); - gtk_object_set_data (GTK_OBJECT (gum), "CONTESTSIZE_LABEL", CONTESTSIZE_LABEL); + gtk_widget_ref (CONTESTSIZE_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "CONTESTSIZE_LABEL", CONTESTSIZE_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CONTESTSIZE_LABEL); gtk_table_attach (GTK_TABLE (table10), CONTESTSIZE_LABEL, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -2826,7 +3512,9 @@ gtk_misc_set_padding (GTK_MISC (CONTESTSIZE_LABEL), 10, 0); NUMMATCH_LABEL = gtk_label_new ("NUMMATCH:"); - gtk_object_set_data (GTK_OBJECT (gum), "NUMMATCH_LABEL", NUMMATCH_LABEL); + gtk_widget_ref (NUMMATCH_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "NUMMATCH_LABEL", NUMMATCH_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (NUMMATCH_LABEL); gtk_table_attach (GTK_TABLE (table10), NUMMATCH_LABEL, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -2834,8 +3522,12 @@ gtk_misc_set_alignment (GTK_MISC (NUMMATCH_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (NUMMATCH_LABEL), 10, 0); - SAVE_DOG_STAT_LABEL = gtk_label_new ("SAVEDOGSTAT:"); - gtk_object_set_data (GTK_OBJECT (gum), "SAVE_DOG_STAT_LABEL", SAVE_DOG_STAT_LABEL); + SAVE_DOG_STAT_LABEL = gtk_label_new (""); + SAVE_DOG_STAT_LABEL_key = gtk_label_parse_uline (GTK_LABEL (SAVE_DOG_STAT_LABEL), + "SAVE_DOG_STAT:"); + gtk_widget_ref (SAVE_DOG_STAT_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "SAVE_DOG_STAT_LABEL", SAVE_DOG_STAT_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SAVE_DOG_STAT_LABEL); gtk_table_attach (GTK_TABLE (table10), SAVE_DOG_STAT_LABEL, 0, 1, 4, 5, (GtkAttachOptions) (GTK_FILL), @@ -2844,54 +3536,70 @@ gtk_misc_set_padding (GTK_MISC (SAVE_DOG_STAT_LABEL), 10, 0); label125 = gtk_label_new (""); - gtk_object_set_data (GTK_OBJECT (gum), "label125", label125); + gtk_widget_ref (label125); + gtk_object_set_data_full (GTK_OBJECT (gum), "label125", label125, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label125); gtk_table_attach (GTK_TABLE (table10), label125, 0, 2, 5, 6, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); SAVE_DOG_STAT = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "SAVE_DOG_STAT", SAVE_DOG_STAT); + gtk_widget_ref (SAVE_DOG_STAT); + gtk_object_set_data_full (GTK_OBJECT (gum), "SAVE_DOG_STAT", SAVE_DOG_STAT, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SAVE_DOG_STAT); gtk_table_attach (GTK_TABLE (table10), SAVE_DOG_STAT, 1, 2, 4, 5, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); NUMMATCH = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "NUMMATCH", NUMMATCH); + gtk_widget_ref (NUMMATCH); + gtk_object_set_data_full (GTK_OBJECT (gum), "NUMMATCH", NUMMATCH, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (NUMMATCH); gtk_table_attach (GTK_TABLE (table10), NUMMATCH, 1, 2, 3, 4, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); CONTESTSIZE = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "CONTESTSIZE", CONTESTSIZE); + gtk_widget_ref (CONTESTSIZE); + gtk_object_set_data_full (GTK_OBJECT (gum), "CONTESTSIZE", CONTESTSIZE, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CONTESTSIZE); gtk_table_attach (GTK_TABLE (table10), CONTESTSIZE, 1, 2, 2, 3, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); DOGFIGHT = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (gum), "DOGFIGHT", DOGFIGHT); + gtk_widget_ref (DOGFIGHT); + gtk_object_set_data_full (GTK_OBJECT (gum), "DOGFIGHT", DOGFIGHT, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (DOGFIGHT); gtk_table_attach (GTK_TABLE (table10), DOGFIGHT, 1, 2, 1, 2, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); label58 = gtk_label_new ("Dogfight"); - gtk_object_set_data (GTK_OBJECT (gum), "label58", label58); + gtk_widget_ref (label58); + gtk_object_set_data_full (GTK_OBJECT (gum), "label58", label58, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label58); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 10), label58); table3 = gtk_table_new (8, 2, FALSE); - gtk_object_set_data (GTK_OBJECT (gum), "table3", table3); + gtk_widget_ref (table3); + gtk_object_set_data_full (GTK_OBJECT (gum), "table3", table3, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (table3); gtk_container_add (GTK_CONTAINER (notebook1), table3); gtk_container_set_border_width (GTK_CONTAINER (table3), 6); gtk_table_set_row_spacings (GTK_TABLE (table3), 6); SNAKEPATROL_LABEL = gtk_label_new ("(unimplemented)"); - gtk_object_set_data (GTK_OBJECT (gum), "SNAKEPATROL_LABEL", SNAKEPATROL_LABEL); + gtk_widget_ref (SNAKEPATROL_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "SNAKEPATROL_LABEL", SNAKEPATROL_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SNAKEPATROL_LABEL); gtk_table_attach (GTK_TABLE (table3), SNAKEPATROL_LABEL, 0, 1, 5, 6, (GtkAttachOptions) (GTK_FILL), @@ -2900,8 +3608,12 @@ gtk_misc_set_alignment (GTK_MISC (SNAKEPATROL_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (SNAKEPATROL_LABEL), 10, 0); - MAX_CHAOS_BASES_LABEL = gtk_label_new ("MAXCHAOSBASES:"); - gtk_object_set_data (GTK_OBJECT (gum), "MAX_CHAOS_BASES_LABEL", MAX_CHAOS_BASES_LABEL); + MAX_CHAOS_BASES_LABEL = gtk_label_new (""); + gtk_label_parse_uline (GTK_LABEL (MAX_CHAOS_BASES_LABEL), + "MAX_CHAOS_BASES:"); + gtk_widget_ref (MAX_CHAOS_BASES_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "MAX_CHAOS_BASES_LABEL", MAX_CHAOS_BASES_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (MAX_CHAOS_BASES_LABEL); gtk_table_attach (GTK_TABLE (table3), MAX_CHAOS_BASES_LABEL, 0, 1, 4, 5, (GtkAttachOptions) (GTK_FILL), @@ -2909,8 +3621,12 @@ gtk_misc_set_alignment (GTK_MISC (MAX_CHAOS_BASES_LABEL), 1, 0.5); gtk_misc_set_padding (GTK_MISC (MAX_CHAOS_BASES_LABEL), 10, 0); - PINGPONG_PLASMA_LABEL = gtk_label_new ("PINGPONGPLASMA:"); - gtk_object_set_data (GTK_OBJECT (gum), "PINGPONG_PLASMA_LABEL", PINGPONG_PLASMA_LABEL); + PINGPONG_PLASMA_LABEL = gtk_label_new (""); + gtk_label_parse_uline (GTK_LABEL (PINGPONG_PLASMA_LABEL), + "PINGPONG_PLASMA:"); + gtk_widget_ref (PINGPONG_PLASMA_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "PINGPONG_PLASMA_LABEL", PINGPONG_PLASMA_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PINGPONG_PLASMA_LABEL); gtk_table_attach (GTK_TABLE (table3), PINGPONG_PLASMA_LABEL, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -2919,7 +3635,9 @@ gtk_misc_set_padding (GTK_MISC (PINGPONG_PLASMA_LABEL), 10, 0); STARBASE_MINES_LABEL = gtk_label_new ("(unimplemented)"); - gtk_object_set_data (GTK_OBJECT (gum), "STARBASE_MINES_LABEL", STARBASE_MINES_LABEL); + gtk_widget_ref (STARBASE_MINES_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "STARBASE_MINES_LABEL", STARBASE_MINES_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (STARBASE_MINES_LABEL); gtk_table_attach (GTK_TABLE (table3), STARBASE_MINES_LABEL, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -2929,7 +3647,9 @@ gtk_misc_set_padding (GTK_MISC (STARBASE_MINES_LABEL), 10, 0); CHAOS_LABEL = gtk_label_new ("CHAOS:"); - gtk_object_set_data (GTK_OBJECT (gum), "CHAOS_LABEL", CHAOS_LABEL); + gtk_widget_ref (CHAOS_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "CHAOS_LABEL", CHAOS_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CHAOS_LABEL); gtk_table_attach (GTK_TABLE (table3), CHAOS_LABEL, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -2938,21 +3658,27 @@ gtk_misc_set_padding (GTK_MISC (CHAOS_LABEL), 10, 0); label122 = gtk_label_new ("Chaos Settings\n"); - gtk_object_set_data (GTK_OBJECT (gum), "label122", label122); + gtk_widget_ref (label122); + gtk_object_set_data_full (GTK_OBJECT (gum), "label122", label122, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label122); gtk_table_attach (GTK_TABLE (table3), label122, 0, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); label123 = gtk_label_new (""); - gtk_object_set_data (GTK_OBJECT (gum), "label123", label123); + gtk_widget_ref (label123); + gtk_object_set_data_full (GTK_OBJECT (gum), "label123", label123, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label123); gtk_table_attach (GTK_TABLE (table3), label123, 0, 2, 7, 8, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); hbox46 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox46", hbox46); + gtk_widget_ref (hbox46); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox46", hbox46, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox46); gtk_table_attach (GTK_TABLE (table3), hbox46, 1, 2, 4, 5, (GtkAttachOptions) (GTK_FILL), @@ -2960,7 +3686,9 @@ MAX_CHAOS_BASES_adj = gtk_adjustment_new (2, 0, 16, 1, 10, 10); MAX_CHAOS_BASES = gtk_spin_button_new (GTK_ADJUSTMENT (MAX_CHAOS_BASES_adj), 1, 0); - gtk_object_set_data (GTK_OBJECT (gum), "MAX_CHAOS_BASES", MAX_CHAOS_BASES); + gtk_widget_ref (MAX_CHAOS_BASES); + gtk_object_set_data_full (GTK_OBJECT (gum), "MAX_CHAOS_BASES", MAX_CHAOS_BASES, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (MAX_CHAOS_BASES); gtk_box_pack_start (GTK_BOX (hbox46), MAX_CHAOS_BASES, FALSE, FALSE, 0); gtk_widget_set_usize (MAX_CHAOS_BASES, 60, -2); @@ -2968,7 +3696,9 @@ gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (MAX_CHAOS_BASES), TRUE); hbox47 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox47", hbox47); + gtk_widget_ref (hbox47); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox47", hbox47, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox47); gtk_table_attach (GTK_TABLE (table3), hbox47, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -2976,18 +3706,24 @@ CHAOS_0 = gtk_radio_button_new_with_label (CHAOS_group, "No"); CHAOS_group = gtk_radio_button_group (GTK_RADIO_BUTTON (CHAOS_0)); - gtk_object_set_data (GTK_OBJECT (gum), "CHAOS_0", CHAOS_0); + gtk_widget_ref (CHAOS_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "CHAOS_0", CHAOS_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CHAOS_0); gtk_box_pack_start (GTK_BOX (hbox47), CHAOS_0, FALSE, FALSE, 0); CHAOS_1 = gtk_radio_button_new_with_label (CHAOS_group, "Yes"); CHAOS_group = gtk_radio_button_group (GTK_RADIO_BUTTON (CHAOS_1)); - gtk_object_set_data (GTK_OBJECT (gum), "CHAOS_1", CHAOS_1); + gtk_widget_ref (CHAOS_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "CHAOS_1", CHAOS_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (CHAOS_1); gtk_box_pack_start (GTK_BOX (hbox47), CHAOS_1, FALSE, FALSE, 0); hbox48 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox48", hbox48); + gtk_widget_ref (hbox48); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox48", hbox48, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox48); gtk_table_attach (GTK_TABLE (table3), hbox48, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), @@ -2995,20 +3731,26 @@ STARBASE_MINES_0 = gtk_radio_button_new_with_label (STARBASE_MINES_group, "No"); STARBASE_MINES_group = gtk_radio_button_group (GTK_RADIO_BUTTON (STARBASE_MINES_0)); - gtk_object_set_data (GTK_OBJECT (gum), "STARBASE_MINES_0", STARBASE_MINES_0); + gtk_widget_ref (STARBASE_MINES_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "STARBASE_MINES_0", STARBASE_MINES_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (STARBASE_MINES_0); gtk_box_pack_start (GTK_BOX (hbox48), STARBASE_MINES_0, FALSE, FALSE, 0); gtk_widget_set_sensitive (STARBASE_MINES_0, FALSE); STARBASE_MINES_1 = gtk_radio_button_new_with_label (STARBASE_MINES_group, "Yes"); STARBASE_MINES_group = gtk_radio_button_group (GTK_RADIO_BUTTON (STARBASE_MINES_1)); - gtk_object_set_data (GTK_OBJECT (gum), "STARBASE_MINES_1", STARBASE_MINES_1); + gtk_widget_ref (STARBASE_MINES_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "STARBASE_MINES_1", STARBASE_MINES_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (STARBASE_MINES_1); gtk_box_pack_start (GTK_BOX (hbox48), STARBASE_MINES_1, FALSE, FALSE, 0); gtk_widget_set_sensitive (STARBASE_MINES_1, FALSE); hbox49 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox49", hbox49); + gtk_widget_ref (hbox49); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox49", hbox49, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox49); gtk_table_attach (GTK_TABLE (table3), hbox49, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -3016,18 +3758,24 @@ PINGPONG_PLASMA_0 = gtk_radio_button_new_with_label (PINGPONG_PLASMA_group, "No"); PINGPONG_PLASMA_group = gtk_radio_button_group (GTK_RADIO_BUTTON (PINGPONG_PLASMA_0)); - gtk_object_set_data (GTK_OBJECT (gum), "PINGPONG_PLASMA_0", PINGPONG_PLASMA_0); + gtk_widget_ref (PINGPONG_PLASMA_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "PINGPONG_PLASMA_0", PINGPONG_PLASMA_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PINGPONG_PLASMA_0); gtk_box_pack_start (GTK_BOX (hbox49), PINGPONG_PLASMA_0, FALSE, FALSE, 0); PINGPONG_PLASMA_1 = gtk_radio_button_new_with_label (PINGPONG_PLASMA_group, "Yes"); PINGPONG_PLASMA_group = gtk_radio_button_group (GTK_RADIO_BUTTON (PINGPONG_PLASMA_1)); - gtk_object_set_data (GTK_OBJECT (gum), "PINGPONG_PLASMA_1", PINGPONG_PLASMA_1); + gtk_widget_ref (PINGPONG_PLASMA_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "PINGPONG_PLASMA_1", PINGPONG_PLASMA_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (PINGPONG_PLASMA_1); gtk_box_pack_start (GTK_BOX (hbox49), PINGPONG_PLASMA_1, FALSE, FALSE, 0); hbox50 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox50", hbox50); + gtk_widget_ref (hbox50); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox50", hbox50, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox50); gtk_table_attach (GTK_TABLE (table3), hbox50, 1, 2, 5, 6, (GtkAttachOptions) (GTK_FILL), @@ -3035,20 +3783,26 @@ SNAKEPATROL_0 = gtk_radio_button_new_with_label (SNAKEPATROL_group, "No"); SNAKEPATROL_group = gtk_radio_button_group (GTK_RADIO_BUTTON (SNAKEPATROL_0)); - gtk_object_set_data (GTK_OBJECT (gum), "SNAKEPATROL_0", SNAKEPATROL_0); + gtk_widget_ref (SNAKEPATROL_0); + gtk_object_set_data_full (GTK_OBJECT (gum), "SNAKEPATROL_0", SNAKEPATROL_0, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SNAKEPATROL_0); gtk_box_pack_start (GTK_BOX (hbox50), SNAKEPATROL_0, FALSE, FALSE, 0); gtk_widget_set_sensitive (SNAKEPATROL_0, FALSE); SNAKEPATROL_1 = gtk_radio_button_new_with_label (SNAKEPATROL_group, "Yes"); SNAKEPATROL_group = gtk_radio_button_group (GTK_RADIO_BUTTON (SNAKEPATROL_1)); - gtk_object_set_data (GTK_OBJECT (gum), "SNAKEPATROL_1", SNAKEPATROL_1); + gtk_widget_ref (SNAKEPATROL_1); + gtk_object_set_data_full (GTK_OBJECT (gum), "SNAKEPATROL_1", SNAKEPATROL_1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (SNAKEPATROL_1); gtk_box_pack_start (GTK_BOX (hbox50), SNAKEPATROL_1, FALSE, FALSE, 0); gtk_widget_set_sensitive (SNAKEPATROL_1, FALSE); REALITY_LABEL = gtk_label_new ("REALITY: "); - gtk_object_set_data (GTK_OBJECT (gum), "REALITY_LABEL", REALITY_LABEL); + gtk_widget_ref (REALITY_LABEL); + gtk_object_set_data_full (GTK_OBJECT (gum), "REALITY_LABEL", REALITY_LABEL, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (REALITY_LABEL); gtk_table_attach (GTK_TABLE (table3), REALITY_LABEL, 0, 1, 6, 7, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -3058,7 +3812,9 @@ REALITY_adj = gtk_adjustment_new (10, 1, 20, 1, 1, 1); REALITY = gtk_spin_button_new (GTK_ADJUSTMENT (REALITY_adj), 1, 0); - gtk_object_set_data (GTK_OBJECT (gum), "REALITY", REALITY); + gtk_widget_ref (REALITY); + gtk_object_set_data_full (GTK_OBJECT (gum), "REALITY", REALITY, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (REALITY); gtk_table_attach (GTK_TABLE (table3), REALITY, 1, 2, 6, 7, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), @@ -3066,40 +3822,54 @@ gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (REALITY), TRUE); label3 = gtk_label_new ("Chaos"); - gtk_object_set_data (GTK_OBJECT (gum), "label3", label3); + gtk_widget_ref (label3); + gtk_object_set_data_full (GTK_OBJECT (gum), "label3", label3, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label3); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 11), label3); hbox52 = gtk_hbox_new (FALSE, 0); - gtk_object_set_data (GTK_OBJECT (gum), "hbox52", hbox52); + gtk_widget_ref (hbox52); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbox52", hbox52, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbox52); gtk_box_pack_start (GTK_BOX (vbox1), hbox52, TRUE, TRUE, 0); statusbar = gtk_statusbar_new (); - gtk_object_set_data (GTK_OBJECT (gum), "statusbar", statusbar); + gtk_widget_ref (statusbar); + gtk_object_set_data_full (GTK_OBJECT (gum), "statusbar", statusbar, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (statusbar); gtk_box_pack_start (GTK_BOX (hbox52), statusbar, TRUE, TRUE, 0); gtk_container_set_border_width (GTK_CONTAINER (statusbar), 9); hbuttonbox1 = gtk_hbutton_box_new (); - gtk_object_set_data (GTK_OBJECT (gum), "hbuttonbox1", hbuttonbox1); + gtk_widget_ref (hbuttonbox1); + gtk_object_set_data_full (GTK_OBJECT (gum), "hbuttonbox1", hbuttonbox1, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbuttonbox1); gtk_box_pack_start (GTK_BOX (hbox52), hbuttonbox1, FALSE, FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (hbuttonbox1), 9); gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_END); reload = gtk_button_new_with_label ("Reload"); - gtk_object_set_data (GTK_OBJECT (gum), "reload", reload); + gtk_widget_ref (reload); + gtk_object_set_data_full (GTK_OBJECT (gum), "reload", reload, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (reload); gtk_container_add (GTK_CONTAINER (hbuttonbox1), reload); save = gtk_button_new_with_label ("Save"); - gtk_object_set_data (GTK_OBJECT (gum), "save", save); + gtk_widget_ref (save); + gtk_object_set_data_full (GTK_OBJECT (gum), "save", save, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (save); gtk_container_add (GTK_CONTAINER (hbuttonbox1), save); quit = gtk_button_new_with_label ("Quit"); - gtk_object_set_data (GTK_OBJECT (gum), "quit", quit); + gtk_widget_ref (quit); + gtk_object_set_data_full (GTK_OBJECT (gum), "quit", quit, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (quit); gtk_container_add (GTK_CONTAINER (hbuttonbox1), quit); @@ -3224,6 +3994,17 @@ GTK_SIGNAL_FUNC (on_quit_clicked), NULL); + gtk_widget_add_accelerator (PING_FREQ, "grab_focus", accel_group, + PING_FREQ_LABEL_key, GDK_MOD1_MASK, 0); + gtk_widget_add_accelerator (PING_ILOSS_INTERVAL, "grab_focus", accel_group, + PING_ILOSS_INTERVAL_LABEL_key, GDK_MOD1_MASK, 0); + gtk_widget_add_accelerator (PING_GHOSTBUST, "grab_focus", accel_group, + PING_GHOSTBUST_LABEL_key, GDK_MOD1_MASK, 0); + gtk_widget_add_accelerator (PING_GHOSTBUST_INTERVAL, "grab_focus", accel_group, + PING_GHOSTBUST_INTERVAL_LABEL_key, GDK_MOD1_MASK, 0); + gtk_widget_add_accelerator (SAVE_DOG_STAT, "grab_focus", accel_group, + SAVE_DOG_STAT_LABEL_key, GDK_MOD1_MASK, 0); + gtk_object_set_data (GTK_OBJECT (gum), "tooltips", tooltips); gtk_window_add_accel_group (GTK_WINDOW (gum), accel_group); @@ -3232,7 +4013,7 @@ } GtkWidget* -create_motd () +create_motd (void) { GtkWidget *motd; GtkWidget *motd_ok; @@ -3243,8 +4024,8 @@ gtk_container_set_border_width (GTK_CONTAINER (motd), 10); GTK_WINDOW (motd)->type = GTK_WINDOW_DIALOG; gtk_window_set_position (GTK_WINDOW (motd), GTK_WIN_POS_MOUSE); + gtk_window_set_wmclass (GTK_WINDOW (motd), "gummotd", "Gummotd"); gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (motd)); - gtk_window_set_wmclass (GTK_WINDOW (motd), "gummotd", "gummotd"); motd_ok = GTK_FILE_SELECTION (motd)->ok_button; gtk_object_set_data (GTK_OBJECT (motd), "motd_ok", motd_ok); @@ -3270,7 +4051,7 @@ } GtkWidget* -create_message () +create_message (void) { GtkWidget *message; GtkWidget *dialog_vbox1; @@ -3281,11 +4062,11 @@ message = gtk_dialog_new (); gtk_object_set_data (GTK_OBJECT (message), "message", message); - GTK_WINDOW (message)->type = GTK_WINDOW_DIALOG; gtk_window_set_title (GTK_WINDOW (message), "unset title"); + GTK_WINDOW (message)->type = GTK_WINDOW_DIALOG; gtk_window_set_position (GTK_WINDOW (message), GTK_WIN_POS_MOUSE); gtk_window_set_policy (GTK_WINDOW (message), TRUE, TRUE, TRUE); - gtk_window_set_wmclass (GTK_WINDOW (message), "gummessage", "gummessage"); + gtk_window_set_wmclass (GTK_WINDOW (message), "gummessage", "Gummessage"); dialog_vbox1 = GTK_DIALOG (message)->vbox; gtk_object_set_data (GTK_OBJECT (message), "dialog_vbox1", dialog_vbox1); @@ -3293,7 +4074,9 @@ gtk_container_set_border_width (GTK_CONTAINER (dialog_vbox1), 6); message_label = gtk_label_new ("unset label"); - gtk_object_set_data (GTK_OBJECT (message), "message_label", message_label); + gtk_widget_ref (message_label); + gtk_object_set_data_full (GTK_OBJECT (message), "message_label", message_label, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (message_label); gtk_box_pack_start (GTK_BOX (dialog_vbox1), message_label, FALSE, FALSE, 0); @@ -3303,17 +4086,19 @@ gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area1), 10); hbuttonbox2 = gtk_hbutton_box_new (); - gtk_object_set_data (GTK_OBJECT (message), "hbuttonbox2", hbuttonbox2); + gtk_widget_ref (hbuttonbox2); + gtk_object_set_data_full (GTK_OBJECT (message), "hbuttonbox2", hbuttonbox2, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (hbuttonbox2); gtk_box_pack_start (GTK_BOX (dialog_action_area1), hbuttonbox2, TRUE, TRUE, 0); message_ok = gtk_button_new_with_label ("OK"); - gtk_object_set_data (GTK_OBJECT (message), "message_ok", message_ok); + gtk_widget_ref (message_ok); + gtk_object_set_data_full (GTK_OBJECT (message), "message_ok", message_ok, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (message_ok); gtk_container_add (GTK_CONTAINER (hbuttonbox2), message_ok); GTK_WIDGET_SET_FLAGS (message_ok, GTK_CAN_DEFAULT); - gtk_widget_grab_focus (message_ok); - gtk_widget_grab_default (message_ok); gtk_signal_connect (GTK_OBJECT (message), "delete_event", GTK_SIGNAL_FUNC (on_message_delete_event), @@ -3322,11 +4107,13 @@ GTK_SIGNAL_FUNC (on_message_ok), NULL); + gtk_widget_grab_focus (message_ok); + gtk_widget_grab_default (message_ok); return message; } GtkWidget* -create_open () +create_open (void) { GtkWidget *open; GtkWidget *open_ok; @@ -3337,8 +4124,8 @@ gtk_container_set_border_width (GTK_CONTAINER (open), 10); GTK_WINDOW (open)->type = GTK_WINDOW_DIALOG; gtk_window_set_position (GTK_WINDOW (open), GTK_WIN_POS_MOUSE); + gtk_window_set_wmclass (GTK_WINDOW (open), "gumopen", "Gumopen"); gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (open)); - gtk_window_set_wmclass (GTK_WINDOW (open), "gumopen", "gumopen"); open_ok = GTK_FILE_SELECTION (open)->ok_button; gtk_object_set_data (GTK_OBJECT (open), "open_ok", open_ok); @@ -3364,7 +4151,7 @@ } GtkWidget* -create_saveas () +create_saveas (void) { GtkWidget *saveas; GtkWidget *saveas_ok; @@ -3375,7 +4162,7 @@ gtk_container_set_border_width (GTK_CONTAINER (saveas), 10); GTK_WINDOW (saveas)->type = GTK_WINDOW_DIALOG; gtk_window_set_position (GTK_WINDOW (saveas), GTK_WIN_POS_MOUSE); - gtk_window_set_wmclass (GTK_WINDOW (saveas), "gumsaveas", "gumsaveas"); + gtk_window_set_wmclass (GTK_WINDOW (saveas), "gumsaveas", "Gumsaveas"); saveas_ok = GTK_FILE_SELECTION (saveas)->ok_button; gtk_object_set_data (GTK_OBJECT (saveas), "saveas_ok", saveas_ok); @@ -3401,7 +4188,7 @@ } GtkWidget* -create_welcome () +create_welcome (void) { GtkWidget *welcome; GtkWidget *splashpixmap; @@ -3412,10 +4199,11 @@ gtk_window_set_position (GTK_WINDOW (welcome), GTK_WIN_POS_CENTER); splashpixmap = create_pixmap (welcome, "gum.xpm"); - gtk_object_set_data (GTK_OBJECT (welcome), "splashpixmap", splashpixmap); + gtk_widget_ref (splashpixmap); + gtk_object_set_data_full (GTK_OBJECT (welcome), "splashpixmap", splashpixmap, + (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (splashpixmap); gtk_container_add (GTK_CONTAINER (welcome), splashpixmap); - return welcome; } Index: Vanilla/gum/support.c diff -u Vanilla/gum/support.c:1.1 Vanilla/gum/support.c:1.2 --- Vanilla/gum/support.c:1.1 Sun Jul 18 19:58:11 1999 +++ Vanilla/gum/support.c Tue Aug 15 17:42:45 2000 @@ -6,6 +6,7 @@ # include <config.h> #endif +#include <sys/types.h> #include <sys/stat.h> #include <unistd.h> #include <string.h> @@ -95,6 +96,9 @@ GdkBitmap *mask; GtkWidget *pixmap; GList *elem; + + if (!filename || !filename[0]) + return create_dummy_pixmap (widget); /* We first try any pixmaps directories set by the application. */ elem = pixmaps_directories; Index: Vanilla/gum/support.h diff -u Vanilla/gum/support.h:1.1 Vanilla/gum/support.h:1.2 --- Vanilla/gum/support.h:1.1 Sun Jul 18 19:58:11 1999 +++ Vanilla/gum/support.h Tue Aug 15 17:42:45 2000 @@ -2,6 +2,10 @@ * DO NOT EDIT THIS FILE - it is generated by Glade. */ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include <gtk/gtk.h> /*