[patch] files/envy24control-gtk2.patch

envy24control-gtk2.patch (text/plain), 3.36 KB, created by Harold Aling on 2006-01-18 12:57:07 UTC

Index: envy24control/configure.in
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/envy24control/configure.in,v
retrieving revision 1.6
diff -p -u -r1.6 configure.in
--- alsa-tools/envy24control/configure.in	16 May 2004 13:36:30 -0000	1.6
+++ envy24control/configure.in	21 Dec 2005 00:30:32 -0000
@@ -6,8 +6,28 @@ AC_HEADER_STDC
 
 AM_PATH_GTK(1.0.1)
 AM_PATH_ALSA(1.0.0)
-ENVY24CONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS"
-ENVY24CONTROL_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS"
+
+PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.0, have_gtk2=yes, have_gtk2=no)
+
+AC_ARG_ENABLE(gtk2,
+[  --enable-gtk2           Enable GTK2 graphical interface (default=yes)],
+[if test "$enableval" = "no"
+then
+have_gtk2=no
+fi])
+
+CFLAGS="$CFLAGS $ALSA_FLAGS"
+LDFLAGS="$LDFLAGS $ALSA_LIBS"
+
+if test "$have_gtk2" = "yes"
+then
+        ENVY24CONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK2_CFLAGS"
+        ENVY24CONTROL_LIBS="$LIBS $ALSA_LIBS $LDFLAGS $GTK2_LIBS"
+else
+        ENVY24CONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS"
+        ENVY24CONTROL_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS"
+fi
+
 AC_SUBST(ENVY24CONTROL_CFLAGS)
 AC_SUBST(ENVY24CONTROL_LIBS)
 #AC_SUBST(ALSACTL)
Index: envy24control/envy24control.c
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/envy24control/envy24control.c,v
retrieving revision 1.40
diff -p -u -r1.40 envy24control.c
--- envy24control/envy24control.c	8 Dec 2005 16:36:12 -0000	1.40
+++ envy24control/envy24control.c	21 Dec 2005 00:30:33 -0000
@@ -357,7 +357,7 @@ static void create_mixer(GtkWidget *main
 	gtk_widget_show(scrolledwindow);
 	gtk_box_pack_start(GTK_BOX(hbox), scrolledwindow, TRUE, TRUE, 0);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), 
-					GTK_POLICY_ALWAYS, GTK_POLICY_NEVER);
+					GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
 
 	viewport = gtk_viewport_new(NULL, NULL);
 	gtk_widget_show(viewport);
@@ -529,7 +529,7 @@ static void create_router(GtkWidget *mai
 	gtk_widget_show(scrolledwindow);
 	gtk_container_add(GTK_CONTAINER(notebook), scrolledwindow);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), 
-				       GTK_POLICY_ALWAYS, GTK_POLICY_NEVER);
+				       GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
 
         label = gtk_label_new("Patchbay / Router");
         gtk_widget_show(label);
@@ -1445,7 +1445,7 @@ static void create_analog_volume(GtkWidg
 				   label);
 
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), 
-				       GTK_POLICY_ALWAYS, GTK_POLICY_NEVER);
+				       GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
 	viewport = gtk_viewport_new(NULL, NULL);
 	gtk_widget_show(viewport);
 	gtk_container_add(GTK_CONTAINER(scrolledwindow), viewport);
Index: envy24control/envy24control.h
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/envy24control/envy24control.h,v
retrieving revision 1.15
diff -p -u -r1.15 envy24control.h
--- envy24control/envy24control.h	16 May 2004 13:36:30 -0000	1.15
+++ envy24control/envy24control.h	21 Dec 2005 00:30:33 -0000
@@ -15,7 +15,7 @@
 #endif
 #define MAX_PROFILES 8
 #define MAX_PROFILE_NAME_LENGTH 20
-#define DEFAULT_PROFILERC "~/envy24control/profiles.conf"
+#define DEFAULT_PROFILERC "~/.envy24control/profiles.conf"
 #define SYS_PROFILERC "/etc/envy24control/profiles.conf"
 #ifndef MKDIR
 #define MKDIR "/bin/mkdir"