changeset 3035:13a0e4377c20

Don't use deprecated gtk functions
author Tomasz Mon <desowin@gmail.com>
date Fri, 10 Apr 2009 13:24:02 +0200
parents f7613eafe9f0
children b0f8da03187b
files src/cdaudio-ng/configure.c src/console/Audacious_Config.cxx src/console/Audacious_Driver.cxx src/modplug/gui/interface.cxx src/modplug/gui/main.cxx src/musepack/libmpc.cxx src/vorbis/configure.c src/wavpack/ui.cxx src/wma/wma.c
diffstat 9 files changed, 68 insertions(+), 73 deletions(-) [+]
line wrap: on
line diff
--- a/src/cdaudio-ng/configure.c	Fri Apr 10 12:28:44 2009 +0200
+++ b/src/cdaudio-ng/configure.c	Fri Apr 10 13:24:02 2009 +0200
@@ -235,8 +235,8 @@
 
 
 	buttonbox = gtk_hbutton_box_new();
-	gtk_hbutton_box_set_layout_default(GTK_BUTTONBOX_END);
-	gtk_hbutton_box_set_spacing_default(10);
+        gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonbox), GTK_BUTTONBOX_END);
+        gtk_box_set_spacing(GTK_BOX(buttonbox), 10);
 	gtk_table_attach_defaults(GTK_TABLE(maintable), buttonbox, 0, 2, 3, 4);
 
 	okbutton = gtk_button_new_with_label(_("Ok"));
--- a/src/console/Audacious_Config.cxx	Fri Apr 10 12:28:44 2009 +0200
+++ b/src/console/Audacious_Config.cxx	Fri Apr 10 13:24:02 2009 +0200
@@ -114,7 +114,6 @@
     GtkWidget *configwin_spc_ignorespclen_cbt, *configwin_spc_increverb_cbt;
     GtkWidget /* *hseparator, */ *hbuttonbox, *button_ok, *button_cancel;
     GtkWidget *configwin_notebook;
-    GtkTooltips *tips;
 
     if ( configwin != NULL )
         return;
@@ -130,9 +129,6 @@
     configwin_vbox = gtk_vbox_new( FALSE , 6 );
     gtk_container_add( GTK_CONTAINER(configwin) , configwin_vbox );
 
-    tips = gtk_tooltips_new();
-    g_object_set_data_full( G_OBJECT(configwin) , "tt" , tips , g_object_unref );
-
     configwin_notebook = gtk_notebook_new();
     gtk_notebook_set_tab_pos( GTK_NOTEBOOK(configwin_notebook) , GTK_POS_TOP );
     gtk_box_pack_start( GTK_BOX(configwin_vbox) , configwin_notebook , TRUE , TRUE , 2 );
@@ -258,9 +254,9 @@
     gtk_container_add( GTK_CONTAINER(hbuttonbox) , button_ok );
     gtk_box_pack_start( GTK_BOX(configwin_vbox) , hbuttonbox , FALSE , FALSE , 0 );
 
-    gtk_tooltips_set_tip( GTK_TOOLTIPS(tips) , configwin_gen_playback_deflen_spbt ,
-                          _("The default song length, expressed in seconds, is used for songs "
-                            "that do not provide length information (i.e. looping tracks).") , "" );
+    gtk_widget_set_tooltip_text( configwin_gen_playback_deflen_spbt ,
+                                 _("The default song length, expressed in seconds, is used for songs "
+                                 "that do not provide length information (i.e. looping tracks)."));
 
     gtk_widget_show_all( configwin );
 }
--- a/src/console/Audacious_Driver.cxx	Fri Apr 10 12:28:44 2009 +0200
+++ b/src/console/Audacious_Driver.cxx	Fri Apr 10 13:24:02 2009 +0200
@@ -446,8 +446,8 @@
 						"        Shay Green <gblargg@gmail.com>"),
 						_("Ok"),
 						FALSE, NULL, NULL);
-		gtk_signal_connect(GTK_OBJECT(aboutbox), "destroy",
-					(GCallback)gtk_widget_destroyed, &aboutbox);
+		g_signal_connect(G_OBJECT(aboutbox), "destroy",
+				G_CALLBACK(gtk_widget_destroyed), &aboutbox);
 	}
 }
 
--- a/src/modplug/gui/interface.cxx	Fri Apr 10 12:28:44 2009 +0200
+++ b/src/modplug/gui/interface.cxx	Fri Apr 10 13:24:02 2009 +0200
@@ -21,7 +21,7 @@
 
 #define GLADE_HOOKUP_OBJECT(component,widget,name) \
   g_object_set_data_full (G_OBJECT (component), name, \
-    gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
+    g_object_ref (widget), (GDestroyNotify) g_object_unref)
 
 #define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
   g_object_set_data (G_OBJECT (component), name, widget)
--- a/src/modplug/gui/main.cxx	Fri Apr 10 12:28:44 2009 +0200
+++ b/src/modplug/gui/main.cxx	Fri Apr 10 13:24:02 2009 +0200
@@ -50,8 +50,8 @@
 			NULL);
 		
 		AboutWin = audacious_info_dialog(_("About Modplug"), about_text, _("Ok"), FALSE, NULL, NULL);
-		gtk_signal_connect(GTK_OBJECT(AboutWin), "destroy",
-			GTK_SIGNAL_FUNC(gtk_widget_destroyed), &AboutWin);
+		g_signal_connect(G_OBJECT(AboutWin), "destroy",
+			         G_CALLBACK(gtk_widget_destroyed), &AboutWin);
 		g_free(about_text);
 	}
 	gtk_widget_show(AboutWin);
--- a/src/musepack/libmpc.cxx	Fri Apr 10 12:28:44 2009 +0200
+++ b/src/musepack/libmpc.cxx	Fri Apr 10 13:24:02 2009 +0200
@@ -160,8 +160,8 @@
         widgets.configBox = configBox;
         g_signal_connect(G_OBJECT(configBox), "destroy", G_CALLBACK(gtk_widget_destroyed), &widgets.configBox);
         gtk_window_set_title(GTK_WINDOW(configBox), _("Musepack Decoder Configuration"));
-        gtk_window_set_policy(GTK_WINDOW(configBox), FALSE, FALSE, FALSE);
-        gtk_container_border_width(GTK_CONTAINER(configBox), 10);
+        gtk_window_set_resizable(GTK_WINDOW(configBox), FALSE);
+        gtk_container_set_border_width(GTK_CONTAINER(configBox), 10);
 
         GtkWidget* notebook = gtk_notebook_new();
         GtkWidget* vbox = gtk_vbox_new(FALSE, 10);
@@ -170,10 +170,10 @@
 
         //General Settings Tab
         GtkWidget* generalSet = gtk_frame_new(_("General Settings"));
-        gtk_container_border_width(GTK_CONTAINER(generalSet), 5);
+        gtk_container_set_border_width(GTK_CONTAINER(generalSet), 5);
 
         GtkWidget* gSvbox = gtk_vbox_new(FALSE, 10);
-        gtk_container_border_width(GTK_CONTAINER(gSvbox), 5);
+        gtk_container_set_border_width(GTK_CONTAINER(gSvbox), 5);
         gtk_container_add(GTK_CONTAINER(generalSet), gSvbox);
 
         GtkWidget* bitrateCheck = gtk_check_button_new_with_label(_("Enable Dynamic Bitrate Display"));
@@ -184,10 +184,10 @@
 
         //ReplayGain Settings Tab
         GtkWidget* replaygainSet = gtk_frame_new(_("ReplayGain Settings"));
-        gtk_container_border_width(GTK_CONTAINER(replaygainSet), 5);
+        gtk_container_set_border_width(GTK_CONTAINER(replaygainSet), 5);
 
         GtkWidget* rSVbox = gtk_vbox_new(FALSE, 10);
-        gtk_container_border_width(GTK_CONTAINER(rSVbox), 5);
+        gtk_container_set_border_width(GTK_CONTAINER(rSVbox), 5);
         gtk_container_add(GTK_CONTAINER(replaygainSet), rSVbox);
 
         GtkWidget* clippingCheck = gtk_check_button_new_with_label(_("Enable Clipping Prevention"));
@@ -212,7 +212,7 @@
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(trackCheck), !pluginConfig.albumGain);
         gtk_box_pack_start(GTK_BOX(rgVbox), trackCheck, FALSE, FALSE, 0);
 
-        GtkWidget* albumCheck = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(trackCheck)), _("Use Album Gain"));
+        GtkWidget* albumCheck = gtk_radio_button_new_with_label(gtk_radio_button_get_group(GTK_RADIO_BUTTON(trackCheck)), _("Use Album Gain"));
         widgets.albumCheck = albumCheck;
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(albumCheck), pluginConfig.albumGain);
         gtk_box_pack_start(GTK_BOX(rgVbox), albumCheck, FALSE, FALSE, 0);
@@ -222,7 +222,7 @@
         //Buttons
         GtkWidget* buttonBox = gtk_hbutton_box_new();
         gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonBox), GTK_BUTTONBOX_END);
-        gtk_button_box_set_spacing(GTK_BUTTON_BOX(buttonBox), 5);
+        gtk_box_set_spacing(GTK_BOX(buttonBox), 5);
         gtk_box_pack_start(GTK_BOX(vbox), buttonBox, FALSE, FALSE, 0);
 
         GtkWidget* okButton = gtk_button_new_with_label(_("Ok"));
@@ -474,7 +474,7 @@
         infoBox = gtk_window_new(GTK_WINDOW_TOPLEVEL);
         gtk_window_set_type_hint(GTK_WINDOW(infoBox), GDK_WINDOW_TYPE_HINT_DIALOG);
         widgets.infoBox = infoBox;
-        gtk_window_set_policy(GTK_WINDOW(infoBox), FALSE, FALSE, FALSE);
+        gtk_window_set_resizable(GTK_WINDOW(infoBox), FALSE);
         g_signal_connect(G_OBJECT(infoBox), "destroy", G_CALLBACK(closeInfoBox), NULL);
         gtk_container_set_border_width(GTK_CONTAINER(infoBox), 10);
 
@@ -526,22 +526,22 @@
         mpcGtkTagLabel(_("Year:"), 0, 1, 4, 5, iTable);
         GtkWidget* yearEntry = mpcGtkTagEntry(1, 2, 4, 5, 4, iTable);
         widgets.yearEntry = yearEntry;
-        gtk_widget_set_usize(yearEntry, 4, -1);
+        gtk_widget_set_size_request(yearEntry, 4, -1);
 
         mpcGtkTagLabel(_("Track:"), 2, 3, 4, 5, iTable);
         GtkWidget* trackEntry = mpcGtkTagEntry(3, 4, 4, 5, 4, iTable);
         widgets.trackEntry = trackEntry;
-        gtk_widget_set_usize(trackEntry, 3, -1);
+        gtk_widget_set_size_request(trackEntry, 3, -1);
 
         mpcGtkTagLabel(_("Genre:"), 0, 1, 5, 6, iTable);
         GtkWidget* genreEntry = mpcGtkTagEntry(1, 4, 5, 6, 0, iTable);
         widgets.genreEntry = genreEntry;
-        gtk_widget_set_usize(genreEntry, 20, -1);
+        gtk_widget_set_size_request(genreEntry, 20, -1);
 
         //Buttons
         GtkWidget* buttonBox = gtk_hbutton_box_new();
         gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonBox), GTK_BUTTONBOX_END);
-        gtk_button_box_set_spacing(GTK_BUTTON_BOX(buttonBox), 5);
+        gtk_box_set_spacing(GTK_BOX(buttonBox), 5);
         gtk_box_pack_start(GTK_BOX(leftBox), buttonBox, FALSE, FALSE, 0);
 
         GtkWidget* saveButton = mpcGtkButton(_("Save"), buttonBox);
@@ -659,10 +659,10 @@
 static GtkWidget* mpcGtkTagEntry(int a, int b, int c, int d, int p_Size, GtkWidget* p_Box)
 {
     GtkWidget* entry;
-    if(p_Size == 0)
-        entry = gtk_entry_new();
-    else
-        entry = gtk_entry_new_with_max_length(p_Size);
+    entry = gtk_entry_new();
+    if(p_Size)
+        gtk_entry_set_max_length(GTK_ENTRY(entry), p_Size);
+
     gtk_table_attach(GTK_TABLE(p_Box), entry, a, b, c, d,
                     (GtkAttachOptions) (GTK_FILL | GTK_EXPAND | GTK_SHRINK),
                     (GtkAttachOptions) (GTK_FILL | GTK_EXPAND | GTK_SHRINK), 0, 5);
--- a/src/vorbis/configure.c	Fri Apr 10 12:28:44 2009 +0200
+++ b/src/vorbis/configure.c	Fri Apr 10 13:24:02 2009 +0200
@@ -81,7 +81,7 @@
     gtk_window_set_title(GTK_WINDOW(vorbis_configurewin),
                          _("Ogg Vorbis Audio Plugin Configuration"));
     gtk_window_set_resizable(GTK_WINDOW(vorbis_configurewin), FALSE);
-    gtk_container_border_width(GTK_CONTAINER(vorbis_configurewin), 10);
+    gtk_container_set_border_width(GTK_CONTAINER(vorbis_configurewin), 10);
 
     vbox = gtk_vbox_new(FALSE, 10);
     gtk_container_add(GTK_CONTAINER(vorbis_configurewin), vbox);
@@ -90,10 +90,10 @@
     /* Title config.. */
 
     title_frame = gtk_frame_new(_("Ogg Vorbis Tags:"));
-    gtk_container_border_width(GTK_CONTAINER(title_frame), 5);
+    gtk_container_set_border_width(GTK_CONTAINER(title_frame), 5);
 
     title_tag_vbox = gtk_vbox_new(FALSE, 10);
-    gtk_container_border_width(GTK_CONTAINER(title_tag_vbox), 5);
+    gtk_container_set_border_width(GTK_CONTAINER(title_tag_vbox), 5);
     gtk_container_add(GTK_CONTAINER(title_frame), title_tag_vbox);
 
     title_tag_override =
@@ -124,7 +124,7 @@
 
     bbox = gtk_hbutton_box_new();
     gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-    gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
+    gtk_box_set_spacing(GTK_BOX(bbox), 5);
     gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
     cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
--- a/src/wavpack/ui.cxx	Fri Apr 10 12:28:44 2009 +0200
+++ b/src/wavpack/ui.cxx	Fri Apr 10 13:24:02 2009 +0200
@@ -51,8 +51,8 @@
                            "Some of the plugin code was by Miles Egan\n"
                            "Visit the Wavpack site at http://www.wavpack.com/\n")),
                           (_("Ok")), FALSE, NULL, NULL);
-    gtk_signal_connect(GTK_OBJECT(about_window), "destroy",
-                       GTK_SIGNAL_FUNC(gtk_widget_destroyed), &about_window);
+    g_signal_connect(G_OBJECT(about_window), "destroy",
+                     G_CALLBACK(gtk_widget_destroyed), &about_window);
 }
 
 static void
@@ -135,9 +135,9 @@
         GtkWidget *save_button, *remove_button;
 
         window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-        gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
-        gtk_signal_connect(GTK_OBJECT(window), "destroy",
-                           GTK_SIGNAL_FUNC(gtk_widget_destroyed), &window);
+        gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
+        g_signal_connect(G_OBJECT(window), "destroy",
+                         G_CALLBACK(gtk_widget_destroyed), &window);
         gtk_container_set_border_width(GTK_CONTAINER(window), 10);
 
         vbox = gtk_vbox_new(FALSE, 10);
@@ -221,7 +221,7 @@
                          GTK_FILL, GTK_FILL, 5, 5);
 
         date_entry = gtk_entry_new();
-        gtk_widget_set_usize(date_entry, 60, -1);
+        gtk_widget_set_size_request(date_entry, 60, -1);
         gtk_table_attach(GTK_TABLE(table), date_entry, 1, 2, 4, 5,
                          (GtkAttachOptions) (GTK_FILL | GTK_EXPAND |
                                              GTK_SHRINK),
@@ -233,8 +233,9 @@
         gtk_table_attach(GTK_TABLE(table), label, 2, 3, 4, 5,
                          GTK_FILL, GTK_FILL, 5, 5);
 
-        tracknumber_entry = gtk_entry_new_with_max_length(4);
-        gtk_widget_set_usize(tracknumber_entry, 20, -1);
+        tracknumber_entry = gtk_entry_new();
+        gtk_entry_set_max_length(GTK_ENTRY(tracknumber_entry), 4);
+        gtk_widget_set_size_request(tracknumber_entry, 20, -1);
         gtk_table_attach(GTK_TABLE(table), tracknumber_entry, 3, 4, 4,
                          5,
                          (GtkAttachOptions) (GTK_FILL | GTK_EXPAND |
@@ -248,7 +249,7 @@
                          GTK_FILL, GTK_FILL, 5, 5);
 
         genre_entry = gtk_entry_new();
-        gtk_widget_set_usize(genre_entry, 20, -1);
+        gtk_widget_set_size_request(genre_entry, 20, -1);
         gtk_table_attach(GTK_TABLE(table), genre_entry, 1, 4, 5,
                          6,
                          (GtkAttachOptions) (GTK_FILL | GTK_EXPAND |
@@ -258,26 +259,24 @@
 
         bbox = gtk_hbutton_box_new();
         gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-        gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
+        gtk_box_set_spacing(GTK_BOX(bbox), 5);
         gtk_box_pack_start(GTK_BOX(left_vbox), bbox, FALSE, FALSE, 0);
 
         save_button = gtk_button_new_with_label(_("Save"));
-        gtk_signal_connect(GTK_OBJECT(save_button), "clicked",
-                           GTK_SIGNAL_FUNC(save_cb), NULL);
+        g_signal_connect(G_OBJECT(save_button), "clicked",
+                         G_CALLBACK(save_cb), NULL);
         GTK_WIDGET_SET_FLAGS(save_button, GTK_CAN_DEFAULT);
         gtk_box_pack_start(GTK_BOX(bbox), save_button, TRUE, TRUE, 0);
 
         remove_button = gtk_button_new_with_label(_("Remove Tag"));
-        gtk_signal_connect_object(GTK_OBJECT(remove_button),
-                                  "clicked",
-                                  GTK_SIGNAL_FUNC(remove_cb), NULL);
+        g_signal_connect_swapped(G_OBJECT(remove_button), "clicked",
+                                 G_CALLBACK(remove_cb), NULL);
         GTK_WIDGET_SET_FLAGS(remove_button, GTK_CAN_DEFAULT);
         gtk_box_pack_start(GTK_BOX(bbox), remove_button, TRUE, TRUE, 0);
 
         cancel_button = gtk_button_new_with_label(_("Cancel"));
-        gtk_signal_connect_object(GTK_OBJECT(cancel_button),
-                                  "clicked",
-                                  GTK_SIGNAL_FUNC(close_window), NULL);
+        g_signal_connect_swapped(G_OBJECT(cancel_button), "clicked",
+                                 G_CALLBACK(close_window), NULL);
         GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT);
         gtk_box_pack_start(GTK_BOX(bbox), cancel_button, TRUE, TRUE, 0);
         gtk_widget_grab_default(cancel_button);
@@ -461,13 +460,13 @@
     }
 
     wv_configurewin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    gtk_signal_connect(GTK_OBJECT(wv_configurewin), "destroy",
-                       GTK_SIGNAL_FUNC(gtk_widget_destroyed),
-                       &wv_configurewin);
+    g_signal_connect(G_OBJECT(wv_configurewin), "destroy",
+                     G_CALLBACK(gtk_widget_destroyed),
+                     &wv_configurewin);
     gtk_window_set_title(GTK_WINDOW(wv_configurewin),
                          _("Wavpack Configuration"));
-    gtk_window_set_policy(GTK_WINDOW(wv_configurewin), FALSE, FALSE, FALSE);
-    gtk_container_border_width(GTK_CONTAINER(wv_configurewin), 10);
+    gtk_window_set_resizable(GTK_WINDOW(wv_configurewin), FALSE);
+    gtk_container_set_border_width(GTK_CONTAINER(wv_configurewin), 10);
 
     vbox = gtk_vbox_new(FALSE, 10);
     gtk_container_add(GTK_CONTAINER(wv_configurewin), vbox);
@@ -479,10 +478,10 @@
     /* Plugin Settings */
 
     rg_frame = gtk_frame_new(_("General Plugin Settings:"));
-    gtk_container_border_width(GTK_CONTAINER(rg_frame), 5);
+    gtk_container_set_border_width(GTK_CONTAINER(rg_frame), 5);
 
     rg_vbox = gtk_vbox_new(FALSE, 10);
-    gtk_container_border_width(GTK_CONTAINER(rg_vbox), 5);
+    gtk_container_set_border_width(GTK_CONTAINER(rg_vbox), 5);
     gtk_container_add(GTK_CONTAINER(rg_frame), rg_vbox);
 
     rg_dyn_bitrate =
@@ -497,10 +496,10 @@
     /* Replay Gain.. */
 
     rg_frame = gtk_frame_new(_("ReplayGain Settings:"));
-    gtk_container_border_width(GTK_CONTAINER(rg_frame), 5);
+    gtk_container_set_border_width(GTK_CONTAINER(rg_frame), 5);
 
     rg_vbox = gtk_vbox_new(FALSE, 10);
-    gtk_container_border_width(GTK_CONTAINER(rg_vbox), 5);
+    gtk_container_set_border_width(GTK_CONTAINER(rg_vbox), 5);
     gtk_container_add(GTK_CONTAINER(rg_frame), rg_vbox);
 
     rg_clip_switch =
@@ -517,8 +516,8 @@
     rg_type_frame = gtk_frame_new(_("ReplayGain Type:"));
     gtk_box_pack_start(GTK_BOX(rg_vbox), rg_type_frame, FALSE, FALSE, 0);
 
-    gtk_signal_connect(GTK_OBJECT(rg_switch), "toggled",
-                       GTK_SIGNAL_FUNC(rg_switch_cb), rg_type_frame);
+    g_signal_connect(G_OBJECT(rg_switch), "toggled",
+                     G_CALLBACK(rg_switch_cb), rg_type_frame);
 
     rg_type_vbox = gtk_vbox_new(FALSE, 5);
     gtk_container_set_border_width(GTK_CONTAINER(rg_type_vbox), 5);
@@ -531,7 +530,7 @@
     gtk_box_pack_start(GTK_BOX(rg_type_vbox), rg_track_gain, FALSE, FALSE, 0);
 
     rg_album_gain =
-        gtk_radio_button_new_with_label(gtk_radio_button_group
+        gtk_radio_button_new_with_label(gtk_radio_button_get_group
                                         (GTK_RADIO_BUTTON(rg_track_gain)),
                                         _("use Album Gain/Peak"));
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rg_album_gain),
@@ -547,20 +546,20 @@
 
     bbox = gtk_hbutton_box_new();
     gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-    gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
+    gtk_box_set_spacing(GTK_BOX(bbox), 5);
     gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
     ok = gtk_button_new_with_label(_("Ok"));
-    gtk_signal_connect(GTK_OBJECT(ok), "clicked",
-                       GTK_SIGNAL_FUNC(wv_configurewin_ok), NULL);
+    g_signal_connect(G_OBJECT(ok), "clicked",
+                     G_CALLBACK(wv_configurewin_ok), NULL);
     GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT);
     gtk_box_pack_start(GTK_BOX(bbox), ok, TRUE, TRUE, 0);
     gtk_widget_grab_default(ok);
 
     cancel = gtk_button_new_with_label(_("Cancel"));
-    gtk_signal_connect_object(GTK_OBJECT(cancel), "clicked",
-                              GTK_SIGNAL_FUNC(gtk_widget_destroy),
-                              GTK_OBJECT(wv_configurewin));
+    g_signal_connect_swapped(G_OBJECT(cancel), "clicked",
+                             G_CALLBACK(gtk_widget_destroy),
+                             G_OBJECT(wv_configurewin));
     GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT);
     gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0);
 
--- a/src/wma/wma.c	Fri Apr 10 12:28:44 2009 +0200
+++ b/src/wma/wma.c	Fri Apr 10 13:24:02 2009 +0200
@@ -136,8 +136,8 @@
     g_signal_connect(G_OBJECT(dialog1), "destroy",
                      G_CALLBACK(gtk_widget_destroyed), &dialog1);
     gtk_window_set_title(GTK_WINDOW(dialog1), title);
-    gtk_window_set_policy(GTK_WINDOW(dialog1), FALSE, FALSE, FALSE);
-    gtk_container_border_width(GTK_CONTAINER(dialog1), 5);
+    gtk_window_set_resizable(GTK_WINDOW(dialog1), FALSE);
+    gtk_container_set_border_width(GTK_CONTAINER(dialog1), 5);
     label1 = gtk_label_new(message);
     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog1)->vbox), label1, TRUE, TRUE, 0);
     gtk_widget_show(label1);