diff -durN gnome-alsamixer.orig/configure.ac gnome-alsamixer/configure.ac --- gnome-alsamixer.orig/configure.ac 2006-11-18 22:55:58.000000000 +0300 +++ gnome-alsamixer/configure.ac 2012-04-09 07:55:30.236412398 +0400 @@ -32,7 +32,7 @@ AC_DEFINE_UNQUOTED(HAVE_GTK26, , "") fi -pkg_modules="libgnomeui-2.0 gconf-2.0 alsa" +pkg_modules="gtk+-2.0 gconf-2.0 alsa" PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) AC_SUBST(PACKAGE_CFLAGS) AC_SUBST(PACKAGE_LIBS) diff -durN gnome-alsamixer.orig/src/gam-app.c gnome-alsamixer/src/gam-app.c --- gnome-alsamixer.orig/src/gam-app.c 2012-04-09 06:16:24.000000000 +0400 +++ gnome-alsamixer/src/gam-app.c 2012-04-09 08:15:12.883325398 +0400 @@ -26,9 +26,6 @@ #include #include #include -#include -#include -#include #include "gam-app.h" #include "gam-mixer.h" @@ -95,7 +92,7 @@ { "Exit", GTK_STOCK_OPEN, N_("E_xit"), "Q", N_("Exit the program"), G_CALLBACK (gam_app_quit_cb) }, { "Properties", GTK_STOCK_PROPERTIES, N_("Sound Card _Properties"), "", N_("Configure the current sound card"), G_CALLBACK (gam_app_properties_cb) }, { "Preferences", GTK_STOCK_PREFERENCES, N_("Program Prefere_nces"), "", N_("Configure the application"), G_CALLBACK (gam_app_preferences_cb) }, - { "About", GNOME_STOCK_ABOUT, N_("_About"), "", N_("About this application"), G_CALLBACK (gam_app_about_cb) }, + { "About", GTK_STOCK_ABOUT, N_("_About"), "", N_("About this application"), G_CALLBACK (gam_app_about_cb) }, }; static const gchar *ui_description = @@ -261,7 +258,7 @@ g_signal_connect (G_OBJECT (gam_app), "delete_event", G_CALLBACK (gam_app_delete), NULL); - gnome_window_icon_set_default_from_file (PIXMAP_ICONDIR"/gnome-alsamixer-icon.png"); + gtk_window_set_icon_from_file (GTK_WINDOW (gam_app), PIXMAP_ICONDIR"/gnome-alsamixer-icon.png", NULL); // Build the main menu and toolbar gtk_action_group_add_actions (priv->main_action_group, action_entries, @@ -432,7 +429,6 @@ NULL }; -#ifdef HAVE_GTK26 gtk_show_about_dialog (GTK_WINDOW (data), "authors", authors, "comments", _("An ALSA mixer for GNOME"), @@ -440,21 +436,6 @@ "name", _("GNOME ALSA Mixer"), "version", VERSION, NULL); -#else - GtkWidget *about; - - about = gnome_about_new (_("GNOME ALSA Mixer"), VERSION, - "\302\251 2001\342\200\2232005 PAW Digital Dynamics", - _("An ALSA mixer for GNOME"), - authors, - NULL, - NULL, - NULL); - gtk_widget_set_name (about, "about"); - gtk_window_set_wmclass (GTK_WINDOW (about), "GAMAbout", "GAMAbout"); - gtk_window_set_destroy_with_parent (GTK_WINDOW (about), TRUE); - gtk_widget_show (about); -#endif } static void diff -durN gnome-alsamixer.orig/src/gam-main.c gnome-alsamixer/src/gam-main.c --- gnome-alsamixer.orig/src/gam-main.c 2005-07-06 19:14:57.000000000 +0400 +++ gnome-alsamixer/src/gam-main.c 2012-04-09 07:56:21.343011180 +0400 @@ -22,16 +22,17 @@ #include #endif -#include #include +#include #include "gam-app.h" int main (int argc, char *argv[]) { + gboolean *prog; GtkWidget *app; - GnomeProgram *prog; + GError *error = NULL; #ifdef ENABLE_NLS bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); @@ -39,11 +40,12 @@ textdomain (GETTEXT_PACKAGE); #endif - prog = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, - argc, argv, - GNOME_PARAM_HUMAN_READABLE_NAME, _("GNOME ALSA Mixer"), - GNOME_PARAM_APP_DATADIR, PACKAGE_DATA_DIR, - NULL); + prog = gtk_init_with_args ( + &argc, &argv, NULL, NULL, GETTEXT_PACKAGE, &error); + if (error != NULL) { + g_printerr ("%s\n", error->message); + exit (1); + } if (!prog) return 1;