diff options
| author | Callum McKenzie <callum@src.gnome.org> | 2009-01-27 02:51:13 +0000 |
|---|---|---|
| committer | Callum McKenzie <callum@src.gnome.org> | 2009-01-27 02:51:13 +0000 |
| commit | 47b21e5ac13a07da67eccfd41b1989ba1b4f2557 (patch) | |
| tree | ad1bfba4d0ff7f6ea52b07dbc6975f80a71ed8f0 /mixer | |
| parent | 9058f4584c51f66f994d43230e87abe0eee76714 (diff) | |
Make sure the mixer actually builds. Especially now that the libgnome stuff is gone.
svn path=/trunk/; revision=11225
Diffstat (limited to 'mixer')
| -rw-r--r-- | mixer/ChangeLog | 5 | ||||
| -rw-r--r-- | mixer/applet.c | 26 | ||||
| -rw-r--r-- | mixer/applet.h | 4 | ||||
| -rw-r--r-- | mixer/preferences.h | 4 |
4 files changed, 9 insertions, 30 deletions
diff --git a/mixer/ChangeLog b/mixer/ChangeLog index 0b2e08589..5cbc266bf 100644 --- a/mixer/ChangeLog +++ b/mixer/ChangeLog @@ -1,8 +1,9 @@ 2009-01-27 Callum McKenzie <callum@spooky-possum.org> - * preferences.c: + * preferences.[ch]: * load.c: - * applet.c: Remove gstreamer 0.8 support. + * applet.[ch]: Remove gstreamer 0.8 support. Remove libgnome + stuff. ==================== 2.25.2 ====================== diff --git a/mixer/applet.c b/mixer/applet.c index d517370ae..94e7da5b4 100644 --- a/mixer/applet.c +++ b/mixer/applet.c @@ -36,9 +36,6 @@ #include <gconf/gconf-client.h> -#include <libgnomeui/gnome-help.h> -#include <libgnome/gnome-desktop-item.h> - #include "applet.h" #include "keys.h" #include "preferences.h" @@ -703,22 +700,10 @@ gnome_volume_applet_toggle_mute (GnomeVolumeApplet *applet) void gnome_volume_applet_run_mixer (GnomeVolumeApplet *applet) { - GnomeDesktopItem *ditem; GError *error = NULL; - if ((ditem = gnome_desktop_item_new_from_basename ("gnome-volume-control.desktop", 0, NULL))) { - gnome_desktop_item_set_launch_time (ditem, gtk_get_current_event_time ()); - gnome_desktop_item_launch_on_screen (ditem, NULL, - GNOME_DESKTOP_ITEM_LAUNCH_ONLY_ONE, - gtk_widget_get_screen (GTK_WIDGET (applet)), - -1, &error); - gnome_desktop_item_unref (ditem); - } - else { - gdk_spawn_command_line_on_screen ( - gtk_widget_get_screen (GTK_WIDGET (applet)), - "gnome-volume-control", &error); - } + gdk_spawn_command_line_on_screen (gtk_widget_get_screen (GTK_WIDGET (applet)), + "gnome-volume-control", &error); if (error) { GtkWidget *dialog; @@ -1380,9 +1365,10 @@ cb_verb (BonoboUIComponent *uic, } else if (!strcmp (verbname, "Help")) { GError *error = NULL; - gnome_help_display_on_screen ("mixer_applet2", NULL, - gtk_widget_get_screen (GTK_WIDGET (applet)), - &error); + gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)), + "ghelp:mixer_applet2", + gtk_get_current_event_time (), + &error); if (error) { GtkWidget *dialog; diff --git a/mixer/applet.h b/mixer/applet.h index 911326c70..cf13784dd 100644 --- a/mixer/applet.h +++ b/mixer/applet.h @@ -29,11 +29,7 @@ #include <gconf/gconf-client.h> #include <panel-applet-gconf.h> #include <gst/gst.h> -#ifdef HAVE_GST10 #include <gst/interfaces/mixer.h> -#else -#include <gst/mixer/mixer.h> -#endif #include "dock.h" diff --git a/mixer/preferences.h b/mixer/preferences.h index 424b65145..f4faadbd0 100644 --- a/mixer/preferences.h +++ b/mixer/preferences.h @@ -26,11 +26,7 @@ #include <gtk/gtk.h> #include <panel-applet.h> #include <panel-applet-gconf.h> -#ifdef HAVE_GST10 #include <gst/interfaces/mixer.h> -#else -#include <gst/mixer/mixer.h> -#endif G_BEGIN_DECLS |