--- interface.c.gtk1	Tue Oct 22 17:39:42 2002
+++ interface.c	Tue Oct 22 17:43:21 2002
@@ -26,7 +26,9 @@
   GtkWidget *menubar1;
   GtkWidget *connection;
   GtkWidget *connection_menu;
+#ifndef USE_GTK2
   GtkAccelGroup *connection_menu_accels;
+#endif
   GtkWidget *connect;
   GtkWidget *disconnect;
   GtkWidget *separator1;
@@ -38,14 +40,18 @@
   GtkWidget *quit;
   GtkWidget *rooms;
   GtkWidget *rooms_menu;
+#ifndef USE_GTK2
   GtkAccelGroup *rooms_menu_accels;
+#endif
   GtkWidget *room_list;
   GtkWidget *separator3;
   GtkWidget *favorites;
   GtkWidget *add_to_favorites;
   GtkWidget *status;
   GtkWidget *status_menu;
+#ifndef USE_GTK2
   GtkAccelGroup *status_menu_accels;
+#endif
   GSList *status_group = NULL;
   GtkWidget *status_here;
   GtkWidget *status_be_right_back;
@@ -63,7 +69,9 @@
   GtkWidget *setup;
   GtkWidget *help_main;
   GtkWidget *help_main_menu;
+#ifndef USE_GTK2
   GtkAccelGroup *help_main_menu_accels;
+#endif
   GtkWidget *help;
   GtkWidget *separator5;
   GtkWidget *about;
@@ -123,7 +131,9 @@
   gtk_object_set_data_full (GTK_OBJECT (window1), "connection_menu", connection_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (connection), connection_menu);
+#ifndef USE_GTK2
   connection_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (connection_menu));
+#endif
 
   connect = gtk_menu_item_new_with_label ("Connect");
   gtk_widget_ref (connect);
@@ -203,7 +213,9 @@
   gtk_object_set_data_full (GTK_OBJECT (window1), "rooms_menu", rooms_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (rooms), rooms_menu);
+#ifndef USE_GTK2
   rooms_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (rooms_menu));
+#endif
 
   room_list = gtk_menu_item_new_with_label ("Room List");
   gtk_widget_ref (room_list);
@@ -246,7 +258,9 @@
   gtk_object_set_data_full (GTK_OBJECT (window1), "status_menu", status_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (status), status_menu);
+#ifndef USE_GTK2
   status_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (status_menu));
+#endif
 
   status_here = gtk_radio_menu_item_new_with_label (status_group, "Here");
   status_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (status_here));
@@ -372,7 +386,9 @@
   gtk_object_set_data_full (GTK_OBJECT (window1), "help_main_menu", help_main_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (help_main), help_main_menu);
+#ifndef USE_GTK2
   help_main_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (help_main_menu));
+#endif
 
   help = gtk_menu_item_new_with_label ("Help");
   gtk_widget_ref (help);
@@ -403,7 +419,14 @@
   gtk_widget_show (hbox3);
   gtk_box_pack_start (GTK_BOX (vbox3), hbox3, FALSE, FALSE, 0);
 
+#ifdef USE_GTK2
+  chat_toolbar = gtk_toolbar_new ();
+  gtk_toolbar_set_orientation( GTK_TOOLBAR(chat_toolbar), GTK_ORIENTATION_HORIZONTAL );
+  gtk_toolbar_set_style( GTK_TOOLBAR(chat_toolbar), GTK_TOOLBAR_ICONS );
+#else
   chat_toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
+#endif
+
   gtk_widget_ref (chat_toolbar);
   gtk_object_set_data_full (GTK_OBJECT (window1), "chat_toolbar", chat_toolbar,
                             (GtkDestroyNotify) gtk_widget_unref);
@@ -690,7 +713,9 @@
 create_user_menu (void)
 {
   GtkWidget *user_menu;
+#ifndef USE_GTK2
   GtkAccelGroup *user_menu_accels;
+#endif
   GtkWidget *profile;
   GtkWidget *pm;
   GtkWidget *add_to_friends;
@@ -700,7 +725,9 @@
   user_menu = gtk_menu_new ();
   gtk_object_set_data (GTK_OBJECT (user_menu), "user_menu", user_menu);
   gtk_container_set_border_width (GTK_CONTAINER (user_menu), 2);
+#ifndef USE_GTK2
   user_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (user_menu));
+#endif
 
   profile = gtk_menu_item_new_with_label ("Profile");
   gtk_widget_ref (profile);
@@ -1203,7 +1230,9 @@
 create_alias_menu (void)
 {
   GtkWidget *alias_menu;
+#ifndef USE_GTK2
   GtkAccelGroup *alias_menu_accels;
+#endif
   GtkWidget *alias_send;
   GtkWidget *alias_edit;
   GtkWidget *alias_delete;
@@ -1211,7 +1240,9 @@
 
   alias_menu = gtk_menu_new ();
   gtk_object_set_data (GTK_OBJECT (alias_menu), "alias_menu", alias_menu);
+#ifndef USE_GTK2
   alias_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (alias_menu));
+#endif
 
   alias_send = gtk_menu_item_new_with_label ("Send");
   gtk_widget_ref (alias_send);
@@ -3293,14 +3324,18 @@
 create_setup_menu (void)
 {
   GtkWidget *setup_menu;
+#ifndef USE_GTK2
   GtkAccelGroup *setup_menu_accels;
+#endif
   GtkWidget *setup_insert;
   GtkWidget *setup_delete;
   GtkWidget *setup_edit;
 
   setup_menu = gtk_menu_new ();
   gtk_object_set_data (GTK_OBJECT (setup_menu), "setup_menu", setup_menu);
+#ifndef USE_GTK2
   setup_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (setup_menu));
+#endif
 
   setup_insert = gtk_menu_item_new_with_label ("Insert");
   gtk_widget_ref (setup_insert);
@@ -3438,7 +3473,11 @@
   gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow7), 5);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow7), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
 
+#ifdef USE_GTK2
+  help_text = gtk_text_view_new ();
+#else
   help_text = gtk_text_new (NULL, NULL);
+#endif
   gtk_widget_ref (help_text);
   gtk_object_set_data_full (GTK_OBJECT (help_window), "help_text", help_text,
                             (GtkDestroyNotify) gtk_widget_unref);
@@ -3502,7 +3541,11 @@
   gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow8), 5);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow8), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
 
+#ifdef USE_GTK2
+  pms_text = gtk_text_view_new ();
+#else
   pms_text = gtk_text_new (NULL, NULL);
+#endif
   gtk_widget_ref (pms_text);
   gtk_object_set_data_full (GTK_OBJECT (pm_session), "pms_text", pms_text,
                             (GtkDestroyNotify) gtk_widget_unref);