cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not hide the volume monitor button now that gnome-media has been fixed.

Browse Source
This commit is contained in:
ajacoutot 2009-11-29 09:21:32 +00:00
parent 3801030f3e
commit a3e2b460a2
5 changed files with 2 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/applets2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.79 2009/11/10 17:56:24 jasper Exp $
# $OpenBSD: Makefile,v 1.80 2009/11/29 09:21:32 ajacoutot Exp $
COMMENT-main= applets for use with the GNOME panel
COMMENT-battstat= GNOME applet for monitoring battery level
@ -6,7 +6,7 @@ COMMENT-battstat= GNOME applet for monitoring battery level
GNOME_PROJECT= gnome-applets
GNOME_VERSION= 2.28.0
PKGNAME-main= gnome-applets2-${VERSION}p3
PKGNAME-main= gnome-applets2-${VERSION}p4
PKGNAME-battstat= gnome-applets2-battstat-${VERSION}p0
CATEGORIES= x11

14
x11/gnome/applets2/patches/patch-mixer_GNOME_MixerApplet_xml
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-mixer_GNOME_MixerApplet_xml,v 1.1 2009/10/12 12:03:27 jasper Exp $
gnome-volume-control doesn't get build currently (see gnome/media/Makefile)
--- mixer/GNOME_MixerApplet.xml.orig Mon Oct 12 13:49:01 2009
+++ mixer/GNOME_MixerApplet.xml Mon Oct 12 13:49:03 2009
@@ -2,7 +2,6 @@
<popups>
<popup name="button3">
<menuitem name="Mute" verb="Mute" _label="Mu_te" type="toggle"/>
- <menuitem name="RunMixer" verb="RunMixer" _label="_Open Volume Control"/>
<separator/>
<menuitem name="Pref" verb="Pref" _label="_Preferences" pixtype="stock" pixname="gtk-properties"/>
<menuitem name="Help" verb="Help" _label="_Help" pixtype="stock" pixname="gtk-help"/>

36
x11/gnome/applets2/patches/patch-mixer_applet_c
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-mixer_applet_c,v 1.3 2009/10/12 12:03:27 jasper Exp $
gnome-volume-control doesn't get build currently (see gnome/media/Makefile)
--- mixer/applet.c.orig Fri May 22 05:35:48 2009
+++ mixer/applet.c Mon Oct 12 13:48:55 2009
@@ -385,7 +385,6 @@ gnome_volume_applet_setup (GnomeVolumeApplet *applet,
GtkObject *adj;
BonoboUIComponent *component;
static const BonoboUIVerb verbs[] = {
- BONOBO_UI_UNSAFE_VERB ("RunMixer", cb_verb),
BONOBO_UI_UNSAFE_VERB ("Mute", cb_verb),
BONOBO_UI_UNSAFE_VERB ("Help", cb_verb),
BONOBO_UI_UNSAFE_VERB ("About", cb_verb),
@@ -846,10 +845,6 @@ gnome_volume_applet_key (GtkWidget *widget,
}
break;
case GDK_o:
- if (event->state == GDK_CONTROL_MASK) {
- gnome_volume_applet_run_mixer (applet);
- return TRUE;
- }
break;
case GDK_Escape:
gnome_volume_applet_popdown_dock (applet);
@@ -1390,9 +1385,7 @@ cb_verb (BonoboUIComponent *uic,
{
GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
- if (!strcmp (verbname, "RunMixer")) {
- gnome_volume_applet_run_mixer (applet);
- } else if (!strcmp (verbname, "Help")) {
+ if (!strcmp (verbname, "Help")) {
GError *error = NULL;
gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)),

17
x11/gnome/applets2/patches/patch-mixer_dock_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-mixer_dock_c,v 1.1 2009/10/13 22:53:47 jasper Exp $
gnome-volume-control doesn't get build currently (see gnome/media/Makefile)
--- mixer/dock.c.orig Wed Oct 14 00:46:40 2009
+++ mixer/dock.c Wed Oct 14 00:47:15 2009
@@ -221,10 +221,6 @@ gnome_volume_applet_dock_new (GtkOrientation orientati
g_signal_connect (dock->mute, "toggled", G_CALLBACK (mute_cb), dock);
gtk_box_pack_start (GTK_BOX (innerline), dock->mute, TRUE, TRUE, 0);
- more = gtk_button_new_with_label (_("Volume Control..."));
- g_signal_connect (more, "clicked", G_CALLBACK (launch_mixer_cb), dock);
- gtk_box_pack_end (GTK_BOX (innerline), more, TRUE, TRUE, 0);
-
gtk_container_add (GTK_CONTAINER (dock), frame);
return GTK_WIDGET (dock);

17
x11/gnome/applets2/patches/patch-mixer_load_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-mixer_load_c,v 1.2 2009/10/12 11:38:11 jasper Exp $
--- mixer/load.c.orig Sun Apr 19 04:12:10 2009
+++ mixer/load.c Mon Oct 12 13:13:03 2009
@@ -83,8 +83,13 @@ _filter_func (GstMixer *mixer, gpointer data) {
(helper->count)++;
+#ifdef __OpenBSD__
+ title = g_strdup_printf (_("%d"), helper->count);
+ name = g_strdup_printf ("%s (%s)", longname, title);
+#else
title = g_strdup_printf (_("Unknown Volume Control %d"), helper->count);
name = g_strdup_printf ("%s (%s)", title, longname);
+#endif
original = g_strdup(name);
g_free (title);
}