Index: configure.in
===================================================================
RCS file: /cvsroot/gnokii/gnokii/configure.in,v
retrieving revision 1.149
diff -u -r1.149 configure.in
--- configure.in	31 Jul 2005 21:22:43 -0000	1.149
+++ configure.in	31 Jul 2005 22:20:28 -0000
@@ -389,16 +394,14 @@
          GTK_CFLAGS=""
          GTK_LIBS=""
       else
-         AC_PATH_PROGS(GTK_CONFIG, gtk-config gtk12-config, no)
-         if test "$GTK_CONFIG" = no; then
+         PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0, found_gtk=yes, found_gtk=no)
+         if test "$found_gtk" = no; then
             x_support="no"
             GTK_CFLAGS=""
             GTK_LIBS=""
-            AC_MSG_WARN(Cannot find gtk-config.)
+            AC_MSG_WARN(Cannot find GTK+ 2.0.)
             AC_MSG_WARN(Disabling xgnokii.)
          else
-            GTK_CFLAGS=`$GTK_CONFIG --cflags`
-            GTK_LIBS=`$GTK_CONFIG --libs`
             x_support="yes"
 
             XGNOKIIDIR='${prefix}'
Index: xgnokii/Makefile
===================================================================
RCS file: /cvsroot/gnokii/gnokii/xgnokii/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- xgnokii/Makefile	27 Jun 2004 21:26:30 -0000	1.55
+++ xgnokii/Makefile	31 Jul 2005 22:20:28 -0000
@@ -13,7 +13,8 @@
 include $(TOPDIR)/Makefile.global
 
 CFLAGS += $(PTHREAD_CFLAGS) \
-	  $(GTK_CFLAGS)
+	  $(GTK_CFLAGS) \
+	  -DGTK_ENABLE_BROKEN
 
 LDLIBS += $(PTHREAD_LIBS) \
 	  $(GTK_LIBS)
Index: xgnokii/xgnokii.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/xgnokii/xgnokii.c,v
retrieving revision 1.79
diff -u -r1.79 xgnokii.c
--- xgnokii/xgnokii.c	9 May 2005 20:31:51 -0000	1.79
+++ xgnokii/xgnokii.c	31 Jul 2005 22:20:30 -0000
@@ -34,6 +34,7 @@
 #include "config.h"
 #include "compat.h"
 #include "misc.h"
+#undef G_GNUC_PRINTF
 
 #ifdef HAVE_ASPRINTF
 #  define _GNU_SOURCE
@@ -1292,7 +1293,7 @@
 					     GdkEventKey * event, gpointer callback_data)
 {
 	RefreshUserStatus();
-	if (GTK_EDITABLE(widget)->editable == FALSE)
+	if (gtk_editable_get_editable (GTK_EDITABLE(widget)) == FALSE)
 		return (FALSE);
 	if (event->keyval == GDK_BackSpace || event->keyval == GDK_Clear ||
 	    event->keyval == GDK_Insert || event->keyval == GDK_Delete ||
Index: xgnokii/xgnokii_calendar.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/xgnokii/xgnokii_calendar.c,v
retrieving revision 1.26
diff -u -r1.26 xgnokii_calendar.c
--- xgnokii/xgnokii_calendar.c	24 Apr 2005 20:57:37 -0000	1.26
+++ xgnokii/xgnokii_calendar.c	31 Jul 2005 22:20:32 -0000
@@ -1565,7 +1565,7 @@
 
 	gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL);
 
-	gtk_accel_group_attach(accel_group, GTK_OBJECT(GUI_CalendarWindow));
+	gtk_window_add_accel_group (GTK_WINDOW(GUI_CalendarWindow), accel_group);
 
 	/* Finally, return the actual menu bar created by the item factory. */
 	menubar = gtk_item_factory_get_widget(item_factory, "<main>");
@@ -1579,8 +1579,7 @@
 	gtk_widget_show(menubar);
 
 	/* Create the toolbar */
-	toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
-	gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NORMAL);
+	toolbar = gtk_toolbar_new();
 
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("Read from phone"), NULL,
 				NewPixmap(Read_xpm, GUI_CalendarWindow->window,
Index: xgnokii/xgnokii_contacts.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/xgnokii/xgnokii_contacts.c,v
retrieving revision 1.63
diff -u -r1.63 xgnokii_contacts.c
--- xgnokii/xgnokii_contacts.c	24 Apr 2005 20:57:37 -0000	1.63
+++ xgnokii/xgnokii_contacts.c	31 Jul 2005 22:20:35 -0000
@@ -33,6 +33,7 @@
 
 
 #include "misc.h"
+#undef G_GNUC_PRINTF
 
 #include <stdio.h>
 #include <pthread.h>
@@ -1077,7 +1078,7 @@
 	gtk_widget_hide(GTK_WIDGET(editSubEntriesData.dialog));
 }
 
-static void CreateSubEntriesDialog(EditEntryData * editSubEntriesData, gchar * title, GtkSignalFunc okFunc, gint row)
+static void CreateSubEntriesDialog(EditEntryData * editSubEntriesData, gchar * title, GCallback okFunc, gint row)
 {
 	GtkWidget *button, *label, *hbox;
 
@@ -1173,7 +1174,7 @@
 	gint type;
 
 	if (editSubEntriesData.dialog == NULL)
-		CreateSubEntriesDialog(&editSubEntriesData, _("Edit entry"), OkEditSubEntriesDialog, row);
+		CreateSubEntriesDialog(&editSubEntriesData, _("Edit entry"), G_CALLBACK (OkEditSubEntriesDialog), row);
 
 	gtk_clist_get_text(GTK_CLIST(clist), row, 1, &buf);
 	editNumbersData.row = row;
@@ -1455,7 +1456,7 @@
 }
 
 
-static void CreateEditDialog(EditEntryData * editEntryData, gchar * title, GtkSignalFunc okFunc)
+static void CreateEditDialog(EditEntryData * editEntryData, gchar * title, GCallback okFunc)
 {
 	GtkWidget *button, *label, *hbox;
 
@@ -1567,7 +1568,7 @@
 	editSubEntriesData.pbEntry = pbEntry;
 
 	if (editEditEntryData.dialog == NULL)
-		CreateEditDialog(&editEditEntryData, _("Edit entry"), OkEditEntryDialog);
+		CreateEditDialog(&editEditEntryData, _("Edit entry"), G_CALLBACK (OkEditEntryDialog));
 
 
 	gtk_entry_set_text(GTK_ENTRY(editEditEntryData.name), pbEntry->entry.name);
@@ -1660,7 +1661,7 @@
 	editSubEntriesData.pbEntry = pbEntry;
 
 	if (newEditEntryData.dialog == NULL)
-		CreateEditDialog(&newEditEntryData, _("New entry"), OkNewEntryDialog);
+		CreateEditDialog(&newEditEntryData, _("New entry"), G_CALLBACK (OkNewEntryDialog));
 
 	gtk_entry_set_text(GTK_ENTRY(newEditEntryData.name), pbEntry->entry.name);
 
@@ -1704,7 +1705,7 @@
 	editSubEntriesData.pbEntry = pbEntry;
 
 	if (duplicateEditEntryData.dialog == NULL)
-		CreateEditDialog(&duplicateEditEntryData, _("Duplicate entry"), OkNewEntryDialog);
+		CreateEditDialog(&duplicateEditEntryData, _("Duplicate entry"), G_CALLBACK (OkNewEntryDialog));
 
 	gtk_entry_set_text(GTK_ENTRY(duplicateEditEntryData.name), pbEntry->entry.name);
 
@@ -2109,7 +2110,7 @@
 	GtkWidget *vbox, *label;
 	GtkAdjustment *adj;
 
-	progressDialog.dialog = gtk_window_new(GTK_WINDOW_DIALOG);
+	progressDialog.dialog = gtk_dialog_new();
 	gtk_window_position(GTK_WINDOW(progressDialog.dialog), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(progressDialog.dialog), TRUE);
 	gtk_signal_connect(GTK_OBJECT(progressDialog.dialog), "delete_event",
@@ -2243,7 +2244,7 @@
 }
 
 
-static GtkWidget *CreateSaveQuestionDialog(GtkSignalFunc SaveFunc, GtkSignalFunc DontSaveFunc)
+static GtkWidget *CreateSaveQuestionDialog(GCallback SaveFunc, GCallback DontSaveFunc)
 {
 	GtkWidget *dialog;
 	GtkWidget *button, *label, *hbox, *pixmap;
@@ -3345,7 +3346,7 @@
 
 	gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL);
 
-	gtk_accel_group_attach(accel_group, GTK_OBJECT(GUI_ContactsWindow));
+	gtk_window_add_accel_group(GTK_WINDOW(GUI_ContactsWindow), accel_group);
 
 	/* Finally, return the actual menu bar created by the item factory. */
 	menubar = gtk_item_factory_get_widget(item_factory, "<main>");
@@ -3360,54 +3361,53 @@
 
 	/* Create the toolbar */
 
-	toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
-	gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NORMAL);
+	toolbar = gtk_toolbar_new();
 
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("Read from phone"), NULL,
 				NewPixmap(Read_xpm, GUI_ContactsWindow->window,
 					  &GUI_ContactsWindow->style->bg[GTK_STATE_NORMAL]),
-				(GtkSignalFunc) ReadContacts, NULL);
+				(GCallback) ReadContacts, NULL);
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("Save to phone"), NULL,
 				NewPixmap(Send_xpm, GUI_ContactsWindow->window,
 					  &GUI_ContactsWindow->style->bg[GTK_STATE_NORMAL]),
-				(GtkSignalFunc) SaveContacts, NULL);
+				(GCallback) SaveContacts, NULL);
 
 	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("Import from file"), NULL,
 				NewPixmap(Open_xpm, GUI_ContactsWindow->window,
 					  &GUI_ContactsWindow->style->bg[GTK_STATE_NORMAL]),
-				(GtkSignalFunc) ImportContacts, NULL);
+				(GCallback) ImportContacts, NULL);
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("Export to file"), NULL,
 				NewPixmap(Save_xpm, GUI_ContactsWindow->window,
 					  &GUI_ContactsWindow->style->bg[GTK_STATE_NORMAL]),
-				(GtkSignalFunc) ExportContacts, NULL);
+				(GCallback) ExportContacts, NULL);
 
 	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("New entry"), NULL,
 				NewPixmap(New_xpm, GUI_ContactsWindow->window,
 					  &GUI_ContactsWindow->style->bg[GTK_STATE_NORMAL]),
-				(GtkSignalFunc) NewEntry, NULL);
+				(GCallback) NewEntry, NULL);
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("Duplicate entry"), NULL,
 				NewPixmap(Duplicate_xpm, GUI_ContactsWindow->window,
 					  &GUI_ContactsWindow->style->bg[GTK_STATE_NORMAL]),
-				(GtkSignalFunc) DuplicateEntry, NULL);
+				(GCallback) DuplicateEntry, NULL);
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("Edit entry"), NULL,
 				NewPixmap(Edit_xpm, GUI_ContactsWindow->window,
 					  &GUI_ContactsWindow->style->bg[GTK_STATE_NORMAL]),
-				(GtkSignalFunc) EditEntry, NULL);
+				(GCallback) EditEntry, NULL);
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("Delete entry"), NULL,
 				NewPixmap(Delete_xpm, GUI_ContactsWindow->window,
 					  &GUI_ContactsWindow->style->bg[GTK_STATE_NORMAL]),
-				(GtkSignalFunc) DeleteEntry, NULL);
+				(GCallback) DeleteEntry, NULL);
 
 	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("Dial voice"), NULL,
 				NewPixmap(Dial_xpm, GUI_ContactsWindow->window,
 					  &GUI_ContactsWindow->style->bg[GTK_STATE_NORMAL]),
-				(GtkSignalFunc) DialVoice, NULL);
+				(GCallback) DialVoice, NULL);
 
 //  gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS);
 
Index: xgnokii/xgnokii_dtmf.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/xgnokii/xgnokii_dtmf.c,v
retrieving revision 1.12
diff -u -r1.12 xgnokii_dtmf.c
--- xgnokii/xgnokii_dtmf.c	24 Apr 2005 20:57:37 -0000	1.12
+++ xgnokii/xgnokii_dtmf.c	31 Jul 2005 22:20:35 -0000
@@ -257,7 +257,7 @@
 
 	gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL);
 
-	gtk_accel_group_attach(accel_group, GTK_OBJECT(GUI_DTMFWindow));
+	gtk_window_add_accel_group(GTK_WINDOW(GUI_DTMFWindow), accel_group);
 
 	/* Finally, return the actual menu bar created by the item factory. */
 	menubar = gtk_item_factory_get_widget(item_factory, "<main>");
Index: xgnokii/xgnokii_logos.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/xgnokii/xgnokii_logos.c,v
retrieving revision 1.29
diff -u -r1.29 xgnokii_logos.c
--- xgnokii/xgnokii_logos.c	24 Apr 2005 20:57:37 -0000	1.29
+++ xgnokii/xgnokii_logos.c	31 Jul 2005 22:20:37 -0000
@@ -1550,7 +1550,7 @@
 	CreateInfoDialog(&infoDialog, GUI_LogosWindow);
 
 	accelGroup = gtk_accel_group_new();
-	gtk_accel_group_attach(accelGroup, GTK_OBJECT(GUI_LogosWindow));
+	gtk_window_add_accel_group(GTK_WINDOW(GUI_LogosWindow), accelGroup);
 
 /* create main vbox */
 	vbox = gtk_vbox_new(FALSE, 1);
@@ -1565,9 +1565,7 @@
 	gtk_widget_show(menuBar);
 
 /* toolbar */
-	toolBar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
-	gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolBar), GTK_RELIEF_NORMAL);
-	gtk_toolbar_set_style(GTK_TOOLBAR(toolBar), GTK_TOOLBAR_ICONS);
+	toolBar = gtk_toolbar_new();
 
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolBar), NULL, _("Clear logo"), NULL,
 				NewPixmap(New_xpm, GUI_LogosWindow->window,
@@ -1740,9 +1738,7 @@
 	gtk_widget_show(drawingArea);
 
 	/* vertical tool bar */
-	vertToolBar = gtk_toolbar_new(GTK_ORIENTATION_VERTICAL, GTK_TOOLBAR_ICONS);
-	gtk_toolbar_set_button_relief(GTK_TOOLBAR(vertToolBar), GTK_RELIEF_NORMAL);
-	gtk_toolbar_set_style(GTK_TOOLBAR(vertToolBar), GTK_TOOLBAR_ICONS);
+	vertToolBar = gtk_toolbar_new();
 
 	buttonBrush = gtk_toolbar_append_element(GTK_TOOLBAR(vertToolBar),
 						 GTK_TOOLBAR_CHILD_RADIOBUTTON, NULL, NULL,
Index: xgnokii/xgnokii_netmon.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/xgnokii/xgnokii_netmon.c,v
retrieving revision 1.13
diff -u -r1.13 xgnokii_netmon.c
--- xgnokii/xgnokii_netmon.c	24 Apr 2005 20:57:37 -0000	1.13
+++ xgnokii/xgnokii_netmon.c	31 Jul 2005 22:20:37 -0000
@@ -332,7 +332,7 @@
 
 	gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL);
 
-	gtk_accel_group_attach(accel_group, GTK_OBJECT(GUI_NetmonWindow));
+	gtk_window_add_accel_group(GTK_WINDOW(GUI_NetmonWindow), accel_group);
 
 	/* Finally, return the actual menu bar created by the item factory. */
 	menubar = gtk_item_factory_get_widget(item_factory, "<main>");
@@ -380,8 +380,7 @@
 	vbox = gtk_vbox_new(TRUE, 0);
 
 	/* 1. line */
-	toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_TEXT);
-	gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NORMAL);
+	toolbar = gtk_toolbar_new();
 
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "1", _("Active cell"),
 				NULL, NULL, (GtkSignalFunc) SetDisplay, (gpointer) 1);
@@ -417,8 +416,7 @@
 	gtk_widget_show(toolbar);
 
 	/* 2. line */
-	toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_TEXT);
-	gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NORMAL);
+	toolbar = gtk_toolbar_new();
 
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "13", _("Uplink DTX"),
 				NULL, NULL, (GtkSignalFunc) SetDisplay, (gpointer) 13);
@@ -455,8 +453,7 @@
 	gtk_widget_show(toolbar);
 
 	/* 3. line */
-	toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_TEXT);
-	gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NORMAL);
+	toolbar = gtk_toolbar_new();
 
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "40", _("Reset handover counters"),
 				NULL, NULL, (GtkSignalFunc) SetDisplay, (gpointer) 40);
@@ -493,8 +490,7 @@
 	gtk_widget_show(toolbar);
 
 	/* 4. line */
-	toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_TEXT);
-	gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NORMAL);
+	toolbar = gtk_toolbar_new();
 
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "62", _("Neighbourhood measurement"),
 				NULL, NULL, (GtkSignalFunc) SetDisplay, (gpointer) 62);
@@ -581,7 +577,6 @@
 	button = gtk_spin_button_new(adj, 0, 0);
 	gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(button), TRUE);
 	gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(button), TRUE);
-	gtk_spin_button_set_shadow_type(GTK_SPIN_BUTTON(button), GTK_SHADOW_OUT);
 	gtk_signal_connect(GTK_OBJECT(adj), "value_changed",
 			   GTK_SIGNAL_FUNC(ChangedSpinner), (gpointer) button);
 	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
Index: xgnokii/xgnokii_sms.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/xgnokii/xgnokii_sms.c,v
retrieving revision 1.60
diff -u -r1.60 xgnokii_sms.c
--- xgnokii/xgnokii_sms.c	28 Apr 2005 20:35:59 -0000	1.60
+++ xgnokii/xgnokii_sms.c	31 Jul 2005 22:20:39 -0000
@@ -762,7 +762,6 @@
   SaveSMStoMailbox = gtk_file_selection_new (_("Choose Mailbox File"));
   gtk_object_set_data (GTK_OBJECT (SaveSMStoMailbox), "SaveSMStoMailbox", SaveSMStoMailbox);
   gtk_container_set_border_width (GTK_CONTAINER (SaveSMStoMailbox), 10);
-  GTK_WINDOW (SaveSMStoMailbox)->type = GTK_WINDOW_DIALOG;
 
   ok_button1 = GTK_FILE_SELECTION (SaveSMStoMailbox)->ok_button;
   gtk_object_set_data (GTK_OBJECT (SaveSMStoMailbox), "ok_button1", ok_button1);
@@ -810,7 +809,7 @@
 static inline gint RefreshSMSLength(GtkWidget * widget, GdkEventKey * event, gpointer callback_data)
 {
 	RefreshSMSStatus();
-	if (GTK_EDITABLE(widget)->editable == FALSE)
+	if (gtk_editable_get_editable (GTK_EDITABLE(widget)) == FALSE)
 		return (FALSE);
 	if (event->keyval == GDK_BackSpace || event->keyval == GDK_Clear ||
 	    event->keyval == GDK_Insert || event->keyval == GDK_Delete ||
@@ -1305,7 +1304,7 @@
 
 	gtk_item_factory_create_items(item_factory, nmenu_items, send_menu_items, NULL);
 
-	gtk_accel_group_attach(accel_group, GTK_OBJECT(sendSMS.SMSSendWindow));
+	gtk_window_add_accel_group(GTK_WINDOW(sendSMS.SMSSendWindow), accel_group);
 
 	/* Finally, return the actual menu bar created by the item factory. */
 	menubar = gtk_item_factory_get_widget(item_factory, "<main>");
@@ -1320,8 +1319,7 @@
 
 	/* Create the toolbar */
 
-	toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
-	gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NORMAL);
+	toolbar = gtk_toolbar_new();
 
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("Send message"), NULL,
 				NewPixmap(SendSMS_xpm, GUI_SMSWindow->window,
@@ -1714,7 +1712,7 @@
 
 	gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL);
 
-	gtk_accel_group_attach(accel_group, GTK_OBJECT(GUI_SMSWindow));
+	gtk_window_add_accel_group(GTK_WINDOW(GUI_SMSWindow), accel_group);
 
 	/* Finally, return the actual menu bar created by the item factory. */
 	menubar = gtk_item_factory_get_widget(item_factory, "<main>");
@@ -1728,8 +1726,7 @@
 	gtk_widget_show(menubar);
 
 	/* Create the toolbar */
-	toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
-	gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NORMAL);
+	toolbar = gtk_toolbar_new();
 
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("New message"), NULL,
 				NewPixmap(Edit_xpm, GUI_SMSWindow->window,
@@ -1760,14 +1757,10 @@
 	gtk_widget_show(toolbar);
 
 	vpaned = gtk_vpaned_new();
-	gtk_paned_set_handle_size(GTK_PANED(vpaned), 10);
-	gtk_paned_set_gutter_size(GTK_PANED(vpaned), 15);
 	gtk_box_pack_end(GTK_BOX(main_vbox), vpaned, TRUE, TRUE, 0);
 	gtk_widget_show(vpaned);
 
 	hpaned = gtk_hpaned_new();
-	gtk_paned_set_handle_size(GTK_PANED(hpaned), 8);
-	gtk_paned_set_gutter_size(GTK_PANED(hpaned), 10);
 	gtk_paned_add1(GTK_PANED(vpaned), hpaned);
 	gtk_widget_show(hpaned);
 
Index: xgnokii/xgnokii_speed.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/xgnokii/xgnokii_speed.c,v
retrieving revision 1.17
diff -u -r1.17 xgnokii_speed.c
--- xgnokii/xgnokii_speed.c	24 Apr 2005 20:57:37 -0000	1.17
+++ xgnokii/xgnokii_speed.c	31 Jul 2005 22:20:40 -0000
@@ -567,7 +567,7 @@
 
 	gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL);
 
-	gtk_accel_group_attach(accel_group, GTK_OBJECT(GUI_SpeedDialWindow));
+	gtk_window_add_accel_group(GTK_WINDOW(GUI_SpeedDialWindow), accel_group);
 
 	/* Finally, return the actual menu bar created by the item factory. */
 	menubar = gtk_item_factory_get_widget(item_factory, "<main>");
@@ -582,8 +582,7 @@
 
 	/* Create the toolbar */
 
-	toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
-	gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NORMAL);
+	toolbar = gtk_toolbar_new();
 
 	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("Read from phone"), NULL,
 				NewPixmap(Read_xpm, GUI_SpeedDialWindow->window,
Index: xgnokii/xgnokii_xkeyb.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/xgnokii/xgnokii_xkeyb.c,v
retrieving revision 1.16
diff -u -r1.16 xgnokii_xkeyb.c
--- xgnokii/xgnokii_xkeyb.c	24 Apr 2005 20:57:37 -0000	1.16
+++ xgnokii/xgnokii_xkeyb.c	31 Jul 2005 22:20:40 -0000
@@ -269,7 +269,7 @@
 
 	gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL);
 
-	gtk_accel_group_attach(accel_group, GTK_OBJECT(GUI_XkeybWindow));
+	gtk_window_add_accel_group(GTK_WINDOW(GUI_XkeybWindow), accel_group);
 
 	/* Finally, return the actual menu bar created by the item factory. */
 	menubar = gtk_item_factory_get_widget(item_factory, "<main>");
Index: xgnokii/xgnokii_xring.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/xgnokii/xgnokii_xring.c,v
retrieving revision 1.5
diff -u -r1.5 xgnokii_xring.c
--- xgnokii/xgnokii_xring.c	24 Apr 2005 20:57:37 -0000	1.5
+++ xgnokii/xgnokii_xring.c	31 Jul 2005 22:20:41 -0000
@@ -470,7 +470,6 @@
 	}
 	play_tone(0, 0, -1);
 
-	gdk_key_repeat_restore();
 	gtk_widget_hide(gi.w);
 }
 
@@ -546,7 +545,6 @@
 static gboolean focus_in(GtkWidget * widget, GdkEvent * event, gpointer data)
 {
 	gi.focus = TRUE;
-	gdk_key_repeat_disable();
 
 	return TRUE;
 }
@@ -556,7 +554,6 @@
 	tone_stop(&gi);
 
 	gi.focus = FALSE;
-	gdk_key_repeat_restore();
 
 	return TRUE;
 }
@@ -842,7 +839,7 @@
 	/* create menubar */
 
 	gi.accel = gtk_accel_group_new();
-	gtk_accel_group_attach(gi.accel, GTK_OBJECT(gi.w));
+	gtk_window_add_accel_group(GTK_WINDOW(gi.w), gi.accel);
 	gi.item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", gi.accel);
 	gtk_item_factory_create_items(gi.item_factory, sizeof(menu_items) / sizeof(menu_items[0]), menu_items, NULL);
 	gi.menu = gtk_item_factory_get_widget(gi.item_factory, "<main>");
@@ -851,9 +848,7 @@
 
 	/* create toolbar */
 
-	gi.toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
-	gtk_toolbar_set_button_relief(GTK_TOOLBAR(gi.toolbar), GTK_RELIEF_NORMAL);
-	gtk_toolbar_set_style(GTK_TOOLBAR(gi.toolbar), GTK_TOOLBAR_ICONS);
+	gi.toolbar = gtk_toolbar_new();
 
 	gtk_toolbar_append_item(GTK_TOOLBAR(gi.toolbar), NULL, _("Clear ringtone"), NULL,
 			NewPixmap(New_xpm, gi.w->window, &gi.w->style->bg[GTK_STATE_NORMAL]),