gnome-applets r11225 - trunk/mixer

[callum svn gnome org]

Author: callum
Date: Tue Jan 27 02:51:13 2009
New Revision: 11225
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=11225&view=rev

Log:
Make sure the mixer actually builds. Especially now that the libgnome stuff is gone.

Modified:
   trunk/mixer/ChangeLog
   trunk/mixer/applet.c
   trunk/mixer/applet.h
   trunk/mixer/preferences.h

Modified: trunk/mixer/applet.c
==============================================================================
--- trunk/mixer/applet.c	(original)
+++ trunk/mixer/applet.c	Tue Jan 27 02:51:13 2009
@@ -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 @@
 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 @@
   } 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;

Modified: trunk/mixer/applet.h
==============================================================================
--- trunk/mixer/applet.h	(original)
+++ trunk/mixer/applet.h	Tue Jan 27 02:51:13 2009
@@ -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"
 

Modified: trunk/mixer/preferences.h
==============================================================================
--- trunk/mixer/preferences.h	(original)
+++ trunk/mixer/preferences.h	Tue Jan 27 02:51:13 2009
@@ -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