GNOME.org
 

gnome-panel r11413 - in trunk: . applets/clock applets/fish applets/notification_area applets/wncklet

Author: vuntz
Date: Thu Dec 11 01:02:56 2008
New Revision: 11413
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11413&view=rev

Log:
2008-12-11  Vincent Untz  <vuntz gnome org>

	* configure.in: applets now no longer depend on libgnomeui!
	Also add some specific pkg-config checks for notification-area

2008-12-11  Vincent Untz  <vuntz gnome org>

	* clock-utils.[ch]: (clock_utils_display_help): get rid of
	gnome_help_display_desktop_on_screen(), and improve code
	* clock.c: (prefs_help), (display_help_dialog): trivial update

2008-12-11  Vincent Untz  <vuntz gnome org>

	* fish.c: (show_help): get rid of
	gnome_help_display_desktop_on_screen(), and improve code

2008-12-11  Vincent Untz  <vuntz gnome org>

	* main.c: (help_cb): get rid of gnome_help_display_desktop_on_screen(),
	and improve code (also updated the link inside the help document)
	* Makefile.am: use notification area specific compile flags

2008-12-11  Vincent Untz  <vuntz gnome org>

	* wncklet.[ch]: (wncklet_display_help): get rid of
	gnome_help_display_desktop_on_screen(), and improve code

	* showdesktop.c: (update_icon), (display_help_dialog),
	(display_about_dialog):
	* window-list.c: (response_cb), (display_help_dialog),
	(display_about_dialog), (display_properties_dialog):
	* window-menu.c: (window_menu_help), (window_menu_about):
	* workspace-switcher.c: (display_help_dialog),
	(display_about_dialog), (response_cb), (display_properties_dialog):
	trivial updates, and put the icon name of the applets in some #define
	(also updated some links inside the help documents)


Modified:
   trunk/ChangeLog
   trunk/applets/clock/ChangeLog
   trunk/applets/clock/clock-utils.c
   trunk/applets/clock/clock-utils.h
   trunk/applets/clock/clock.c
   trunk/applets/fish/ChangeLog
   trunk/applets/fish/fish.c
   trunk/applets/notification_area/ChangeLog
   trunk/applets/notification_area/Makefile.am
   trunk/applets/notification_area/main.c
   trunk/applets/wncklet/ChangeLog
   trunk/applets/wncklet/showdesktop.c
   trunk/applets/wncklet/window-list.c
   trunk/applets/wncklet/window-menu.c
   trunk/applets/wncklet/wncklet.c
   trunk/applets/wncklet/wncklet.h
   trunk/applets/wncklet/workspace-switcher.c
   trunk/configure.in

Modified: trunk/applets/clock/clock-utils.c
==============================================================================
--- trunk/applets/clock/clock-utils.c	(original)
+++ trunk/applets/clock/clock-utils.c	Thu Dec 11 01:02:56 2008
@@ -33,7 +33,8 @@
 #include <glib/gi18n.h>
 
 #include <gtk/gtk.h>
-#include <libgnomeui/gnome-help.h>
+
+#include "clock.h"
 
 #include "clock-utils.h"
 
@@ -53,33 +54,67 @@
 void
 clock_utils_display_help (GtkWidget  *widget,
 			  const char *doc_id,
-			  const char *filename,
 			  const char *link_id)
 {
 	GError *error = NULL;
+	char   *uri;
+
+	if (link_id)
+		uri = g_strdup_printf ("ghelp:%s?%s", doc_id, link_id);
+	else
+		uri = g_strdup_printf ("ghelp:%s", doc_id);
+
+	gtk_show_uri (gtk_widget_get_screen (widget), uri,
+		      gtk_get_current_event_time (), &error);
 
-	gnome_help_display_desktop_on_screen (NULL, doc_id, filename, link_id,
-					      gtk_widget_get_screen (widget),
-					      &error);
+	g_free (uri);
 
-	if (error) {
+	if (error &&
+	    g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+		g_error_free (error);
+	else if (error) {
+		GtkWidget *parent;
 		GtkWidget *dialog;
+		char      *primary;
 
-		dialog = gtk_message_dialog_new (NULL,
-						 GTK_DIALOG_DESTROY_WITH_PARENT,
-						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_OK,
-						 _("There was an error displaying help: %s"),
-						 error->message);
+		if (GTK_IS_WINDOW (widget))
+			parent = widget;
+		else
+			parent = NULL;
+
+		primary = g_markup_printf_escaped (
+				_("Could not display help document '%s'"),
+				doc_id);
+		dialog = gtk_message_dialog_new (
+				parent ? GTK_WINDOW (parent) : NULL,
+				GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
+				GTK_MESSAGE_ERROR,
+				GTK_BUTTONS_OK,
+				"%s", primary);
+
+		gtk_message_dialog_format_secondary_text (
+					GTK_MESSAGE_DIALOG (dialog),
+					"%s", error->message);
+
+		g_error_free (error);
+		g_free (primary);
 
 		g_signal_connect (dialog, "response",
 				  G_CALLBACK (gtk_widget_destroy),
 				  NULL);
 
-		gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+		gtk_window_set_icon_name (GTK_WINDOW (dialog), CLOCK_ICON);
 		gtk_window_set_screen (GTK_WINDOW (dialog),
 				       gtk_widget_get_screen (widget));
+
+		if (parent == NULL) {
+			/* we have no parent window */
+			gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog),
+							  FALSE);
+			gtk_window_set_title (GTK_WINDOW (dialog),
+					      _("Error displaying help document"));
+		}
+
 		gtk_widget_show (dialog);
-		g_error_free (error);
 	}
 }

Modified: trunk/applets/clock/clock-utils.h
==============================================================================
--- trunk/applets/clock/clock-utils.h	(original)
+++ trunk/applets/clock/clock-utils.h	Thu Dec 11 01:02:56 2008
@@ -45,7 +45,6 @@
 
 void clock_utils_display_help (GtkWidget  *widget,
 			       const char *doc_id,
-			       const char *filename,
 			       const char *link_id);
 
 G_END_DECLS

Modified: trunk/applets/clock/clock.c
==============================================================================
--- trunk/applets/clock/clock.c	(original)
+++ trunk/applets/clock/clock.c	Thu Dec 11 01:02:56 2008
@@ -3230,8 +3230,8 @@
 static void
 prefs_help (GtkWidget *widget, ClockData *cd)
 {
-	clock_utils_display_help (cd->applet,
-				  "clock", "clock", "clock-settings");
+	clock_utils_display_help (cd->prefs_window,
+				  "clock", "clock-settings");
 }
 
 static void
@@ -3723,7 +3723,7 @@
 		     ClockData         *cd,
 		     const gchar       *verbname)
 {
-	clock_utils_display_help (cd->applet, "clock", "clock", NULL);
+	clock_utils_display_help (cd->applet, "clock", NULL);
 }
 
 static void

Modified: trunk/applets/fish/fish.c
==============================================================================
--- trunk/applets/fish/fish.c	(original)
+++ trunk/applets/fish/fish.c	Thu Dec 11 01:02:56 2008
@@ -40,7 +40,6 @@
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>
 #include <gconf/gconf-client.h>
-#include <libgnomeui/gnome-help.h>
 #include <glade/glade-xml.h>
 
 #define FISH_APPLET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
@@ -146,33 +145,56 @@
 show_help (FishApplet *fish, const char *link_id)
 {
 	GError *error = NULL;
+	char   *uri;
+#define FISH_HELP_DOC "fish"
 
-	gnome_help_display_desktop_on_screen (
-		NULL, "fish", "fish", link_id,
-		gtk_widget_get_screen (GTK_WIDGET (fish)),
-		&error);
+	if (link_id)
+		uri = g_strdup_printf ("ghelp:%s?%s", FISH_HELP_DOC, link_id);
+	else
+		uri = g_strdup_printf ("ghelp:%s", FISH_HELP_DOC);
 
-	if (error) {
+	gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (fish)), uri,
+		      gtk_get_current_event_time (), &error);
+
+	g_free (uri);
+
+	if (error &&
+	    g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+		g_error_free (error);
+	else if (error) {
 		GtkWidget *dialog;
+		char      *primary;
 
+		primary = g_markup_printf_escaped (
+				_("Could not display help document '%s'"),
+				FISH_HELP_DOC);
 		dialog = gtk_message_dialog_new (
 				NULL,
 				GTK_DIALOG_DESTROY_WITH_PARENT,
 				GTK_MESSAGE_ERROR,
 				GTK_BUTTONS_OK,
-				_("There was an error displaying help: %s"),
-				error->message);
+				primary);
+
+		gtk_message_dialog_format_secondary_text (
+					GTK_MESSAGE_DIALOG (dialog),
+					"%s", error->message);
+
+		g_error_free (error);
+		g_free (primary);
 
 		g_signal_connect (dialog, "response",
 				  G_CALLBACK (gtk_widget_destroy),
 				  NULL);
 
 		gtk_window_set_icon_name (GTK_WINDOW (dialog), FISH_ICON);
-		gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 		gtk_window_set_screen (GTK_WINDOW (dialog),
 				       gtk_widget_get_screen (GTK_WIDGET (fish)));
+		/* we have no parent window */
+		gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
+		gtk_window_set_title (GTK_WINDOW (dialog),
+				      _("Error displaying help document"));
+
 		gtk_widget_show (dialog);
-		g_error_free (error);
 	}
 }
 

Modified: trunk/applets/notification_area/Makefile.am
==============================================================================
--- trunk/applets/notification_area/Makefile.am	(original)
+++ trunk/applets/notification_area/Makefile.am	Thu Dec 11 01:02:56 2008
@@ -6,7 +6,7 @@
 	$(GNOME_INCLUDEDIR)					\
 	$(WARN_CFLAGS)						\
 	$(DISABLE_DEPRECATED_CFLAGS)				\
-	$(PANEL_CFLAGS)						\
+	$(NOTIFICATION_AREA_CFLAGS)				\
 	$(LIBPANEL_APPLET_CFLAGS)				\
 	-DG_LOG_DOMAIN=\""notification-area-applet"\"		\
 	-DPREFIX=\"$(prefix)\"					\
@@ -32,7 +32,7 @@
 NOTIFICATION_AREA_LDADD =			\
 	../../libpanel-applet/libpanel-applet-2.la	\
 	$(X_LIBS)					\
-	$(PANEL_LIBS)
+	$(NOTIFICATION_AREA_LIBS)
 
 if NOTIFICATION_AREA_INPROCESS
 APPLET_TYPE     = shlib

Modified: trunk/applets/notification_area/main.c
==============================================================================
--- trunk/applets/notification_area/main.c	(original)
+++ trunk/applets/notification_area/main.c	Thu Dec 11 01:02:56 2008
@@ -28,7 +28,6 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <libgnomeui/gnome-help.h>
 
 #include "na-tray-manager.h"
 #include "na-tray.h"
@@ -70,36 +69,53 @@
 	 AppletData        *data,	  
 	 const gchar       *verbname)   
 {
-  GdkScreen *screen;
-  GError *err = NULL;
+  GError *error = NULL;
+  char   *uri;
+#define NA_HELP_DOC "user-guide"
 
-  screen = gtk_widget_get_screen (GTK_WIDGET (data->applet));
+  uri = g_strdup_printf ("ghelp:%s?%s",
+                         NA_HELP_DOC, "panels-notification-area");
+
+  gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (data->applet)), uri,
+                gtk_get_current_event_time (), &error);
 
-  gnome_help_display_desktop_on_screen (NULL, "user-guide",
-                                        "user-guide.xml", "gospanel-567",
-					screen, &err);
+  g_free (uri);
 
-  if (err != NULL)
+  if (error &&
+      g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+    {
+      g_error_free (error);
+    }
+  else if (error)
     {
       GtkWidget *dialog;
-      
-      dialog = gtk_message_dialog_new (NULL,
-                                       GTK_DIALOG_DESTROY_WITH_PARENT,
-                                       GTK_MESSAGE_ERROR,
-                                       GTK_BUTTONS_OK,
-                                       _("There was an error displaying help: %s"),
-                                       err->message);
-      
-      g_signal_connect (G_OBJECT (dialog), "response",
+      char      *primary;
+
+      primary = g_markup_printf_escaped (
+                                    _("Could not display help document '%s'"),
+                                    NA_HELP_DOC);
+      dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
+                                       GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+                                       primary);
+
+      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                                "%s", error->message);
+
+      g_error_free (error);
+      g_free (primary);
+
+      g_signal_connect (dialog, "response",
                         G_CALLBACK (gtk_widget_destroy), NULL);
-      
+
       gtk_window_set_icon_name (GTK_WINDOW (dialog), NOTIFICATION_AREA_ICON);
-      gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-      gtk_window_set_screen (GTK_WINDOW (dialog), screen);
-      
-      gtk_widget_show (dialog);
+      gtk_window_set_screen (GTK_WINDOW (dialog),
+                             gtk_widget_get_screen (GTK_WIDGET (data->applet)));
+      /* we have no parent window */
+      gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
+      gtk_window_set_title (GTK_WINDOW (dialog),
+                            _("Error displaying help document"));
 
-      g_error_free (err);
+      gtk_widget_show (dialog);
     }
 }
 

Modified: trunk/applets/wncklet/showdesktop.c
==============================================================================
--- trunk/applets/wncklet/showdesktop.c	(original)
+++ trunk/applets/wncklet/showdesktop.c	Thu Dec 11 01:02:56 2008
@@ -40,6 +40,7 @@
 #include <string.h>
 
 #define TIMEOUT_ACTIVATE 1000
+#define SHOW_DESKTOP_ICON "user-desktop"
 
 
 typedef struct {
@@ -173,11 +174,11 @@
 
 	error = NULL;
 	icon = gtk_icon_theme_load_icon (sdd->icon_theme,
-					 "user-desktop",
+					 SHOW_DESKTOP_ICON,
 					 icon_size, 0, &error);
 
 	if (icon == NULL) {
-		g_printerr (_("Failed to load %s: %s\n"), "user-desktop",
+		g_printerr (_("Failed to load %s: %s\n"), SHOW_DESKTOP_ICON,
 			    error ? error->message : _("Icon not found"));
 		if (error) {
 			g_error_free (error);
@@ -505,11 +506,11 @@
 
 static void
 display_help_dialog (BonoboUIComponent *uic,
-                     ShowDesktopData         *sdd,
+                     ShowDesktopData   *sdd,
                      const gchar       *verbname)
 {
 	wncklet_display_help (sdd->applet, "user-guide",
-			      "user-guide.xml", "gospanel-564");
+			      "gospanel-564", SHOW_DESKTOP_ICON);
 }
 
 static void
@@ -536,7 +537,7 @@
 			       authors,
 			       documenters,
 			       translator_credits,
-			       "user-desktop",
+			       SHOW_DESKTOP_ICON,
 			       "show-desktop",
 			       "show-desktop");
 }

Modified: trunk/applets/wncklet/window-list.c
==============================================================================
--- trunk/applets/wncklet/window-list.c	(original)
+++ trunk/applets/wncklet/window-list.c	Thu Dec 11 01:02:56 2008
@@ -28,6 +28,8 @@
 #include "wncklet.h"
 #include "window-list.h"
 
+#define WINDOW_LIST_ICON "gnome-panel-window-list"
+
 typedef struct {
 	GtkWidget *applet;
 	GtkWidget *tasklist;
@@ -93,8 +95,8 @@
 	     TasklistData *tasklist)
 {
 	if (id == GTK_RESPONSE_HELP)
-		wncklet_display_help (tasklist->applet, "user-guide",
-				      "user-guide.xml", "windowlist-prefs");
+		wncklet_display_help (widget, "user-guide",
+				      "windowlist-prefs", WINDOW_LIST_ICON);
 	else
 		gtk_widget_hide (widget);
 }
@@ -585,7 +587,7 @@
 		     const gchar       *verbname)
 {
 	wncklet_display_help (tasklist->applet, "user-guide",
-			      "user-guide.xml", "windowlist");
+			      "windowlist", WINDOW_LIST_ICON);
 }
 
 static void
@@ -611,7 +613,7 @@
 			       authors,
 			       documenters,
 			       translator_credits,
-			       "gnome-panel-window-list",
+			       WINDOW_LIST_ICON,
 			       "tasklist",
 			       "Tasklist");
 }
@@ -784,7 +786,7 @@
 	}
 
 	gtk_window_set_icon_name (GTK_WINDOW (tasklist->properties_dialog),
-				  "gnome-panel-window-list"); 
+				  WINDOW_LIST_ICON); 
 
 	gtk_window_set_resizable (GTK_WINDOW (tasklist->properties_dialog), FALSE);
 	gtk_window_set_screen (GTK_WINDOW (tasklist->properties_dialog),

Modified: trunk/applets/wncklet/window-menu.c
==============================================================================
--- trunk/applets/wncklet/window-menu.c	(original)
+++ trunk/applets/wncklet/window-menu.c	Thu Dec 11 01:02:56 2008
@@ -42,6 +42,8 @@
 #include "wncklet.h"
 #include "window-menu.h"
 
+#define WINDOW_MENU_ICON "gnome-panel-window-menu"
+
 typedef struct {
 	GtkWidget    *applet;
 	GtkWidget    *selector;
@@ -56,7 +58,7 @@
                   const char        *verb) 
 {
 	wncklet_display_help (window_menu->applet, "user-guide",
-			      "user-guide.xml", "panel-windowselector");
+			      "panel-windowselector", WINDOW_MENU_ICON);
 }
 
 static void
@@ -85,7 +87,7 @@
 			       authors,
 			       documenters,
 			       translator_credits,
-			       "gnome-panel-window-menu",
+			       WINDOW_MENU_ICON,
 			       "window-menu",
 			       "WindowMenu");
 }

Modified: trunk/applets/wncklet/wncklet.c
==============================================================================
--- trunk/applets/wncklet/wncklet.c	(original)
+++ trunk/applets/wncklet/wncklet.c	Thu Dec 11 01:02:56 2008
@@ -30,7 +30,6 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <libgnomeui/gnome-help.h>
 #include <libwnck/screen.h>
 #include <libwnck/util.h>
 
@@ -91,34 +90,69 @@
 void
 wncklet_display_help (GtkWidget  *widget,
 		      const char *doc_id,
-		      const char *filename,
-		      const char *link_id)
+		      const char *link_id,
+		      const char *icon_name)
 {
 	GError *error = NULL;
+	char   *uri;
 
-	gnome_help_display_desktop_on_screen (NULL, doc_id, filename, link_id,
-					      gtk_widget_get_screen (widget),
-					      &error);
+	if (link_id)
+		uri = g_strdup_printf ("ghelp:%s?%s", doc_id, link_id);
+	else
+		uri = g_strdup_printf ("ghelp:%s", doc_id);
 
-	if (error) {
+	gtk_show_uri (gtk_widget_get_screen (widget), uri,
+		      gtk_get_current_event_time (), &error);
+
+	g_free (uri);
+
+	if (error &&
+	    g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+		g_error_free (error);
+	else if (error) {
+		GtkWidget *parent;
 		GtkWidget *dialog;
+		char      *primary;
+
+		if (GTK_IS_WINDOW (widget))
+			parent = widget;
+		else
+			parent = NULL;
+
+		primary = g_markup_printf_escaped (
+				_("Could not display help document '%s'"),
+				doc_id);
+		dialog = gtk_message_dialog_new (
+				parent ? GTK_WINDOW (parent) : NULL,
+				GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
+				GTK_MESSAGE_ERROR,
+				GTK_BUTTONS_OK,
+				"%s", primary);
+
+		gtk_message_dialog_format_secondary_text (
+					GTK_MESSAGE_DIALOG (dialog),
+					"%s", error->message);
 
-		dialog = gtk_message_dialog_new (NULL,
-						 GTK_DIALOG_DESTROY_WITH_PARENT,
-						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_OK,
-						 _("There was an error displaying help: %s"),
-						 error->message);
+		g_error_free (error);
+		g_free (primary);
 
 		g_signal_connect (dialog, "response",
 				  G_CALLBACK (gtk_widget_destroy),
 				  NULL);
 
-		gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+		gtk_window_set_icon_name (GTK_WINDOW (dialog), icon_name);
 		gtk_window_set_screen (GTK_WINDOW (dialog),
 				       gtk_widget_get_screen (widget));
+
+		if (parent == NULL) {
+			/* we have no parent window */
+			gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog),
+							  FALSE);
+			gtk_window_set_title (GTK_WINDOW (dialog),
+					      _("Error displaying help document"));
+		}
+
 		gtk_widget_show (dialog);
-		g_error_free (error);
 	}
 }
 

Modified: trunk/applets/wncklet/wncklet.h
==============================================================================
--- trunk/applets/wncklet/wncklet.h	(original)
+++ trunk/applets/wncklet/wncklet.h	Thu Dec 11 01:02:56 2008
@@ -47,8 +47,8 @@
 
 void        wncklet_display_help        (GtkWidget  *widget,
 					 const char *doc_id,
-					 const char *filename,
-					 const char *link_id);
+					 const char *link_id,
+					 const char *icon_name);
 
 WnckScreen *wncklet_get_screen          (GtkWidget *applet);
 	

Modified: trunk/applets/wncklet/workspace-switcher.c
==============================================================================
--- trunk/applets/wncklet/workspace-switcher.c	(original)
+++ trunk/applets/wncklet/workspace-switcher.c	Thu Dec 11 01:02:56 2008
@@ -39,6 +39,8 @@
 #define NUM_WORKSPACES "/apps/metacity/general/num_workspaces"
 #define WORKSPACE_NAME "/apps/metacity/workspace_names/name_1"
 
+#define WORKSPACE_SWITCHER_ICON "gnome-panel-workspace-switcher"
+
 typedef enum {
 	PAGER_WM_METACITY,
 	PAGER_WM_COMPIZ,
@@ -599,7 +601,7 @@
 		     const gchar       *verbname)
 {
 	wncklet_display_help (pager->applet, "user-guide",
-			      "user-guide.xml", "gosoverview-39");
+			      "overview-workspaces", WORKSPACE_SWITCHER_ICON);
 }
 
 static void
@@ -626,7 +628,7 @@
 			       authors,
 			       documenters,
 			       translator_credits,
-			       "gnome-panel-workspace-switcher",
+			       WORKSPACE_SWITCHER_ICON,
 			       "pager",
 			       "Pager");
 }
@@ -812,8 +814,9 @@
 	     PagerData *pager)
 {
 	if (id == GTK_RESPONSE_HELP)
-		wncklet_display_help (pager->applet, "user-guide",
-				      "user-guide.xml", "gosoverview-39");
+		wncklet_display_help (widget, "user-guide",
+				      "overview-workspaces",
+				      WORKSPACE_SWITCHER_ICON);
 	else
 		gtk_widget_destroy (widget);
 }
@@ -1052,7 +1055,7 @@
 	}
 
 	gtk_window_set_icon_name (GTK_WINDOW (pager->properties_dialog),
-	                          "gnome-panel-workspace-switcher");
+	                          WORKSPACE_SWITCHER_ICON);
 	gtk_window_set_screen (GTK_WINDOW (pager->properties_dialog),
 			       gtk_widget_get_screen (pager->applet));
 	gtk_window_present (GTK_WINDOW (pager->properties_dialog));

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Dec 11 01:02:56 2008
@@ -78,7 +78,15 @@
 AC_SUBST(LIBPANEL_APPLET_CFLAGS)
 AC_SUBST(LIBPANEL_APPLET_LIBS)
 
-PKG_CHECK_MODULES(WNCKLET, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED)
+PKG_CHECK_MODULES(FISH, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED cairo >= $CAIRO_REQUIRED)
+AC_SUBST(FISH_CFLAGS)
+AC_SUBST(FISH_LIBS)
+
+PKG_CHECK_MODULES(NOTIFICATION_AREA, gtk+-2.0 >= $GTK_REQUIRED)
+AC_SUBST(NOTIFICATION_AREA_CFLAGS)
+AC_SUBST(NOTIFICATION_AREA_LIBS)
+
+PKG_CHECK_MODULES(WNCKLET, gtk+-2.0 >= $GTK_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED)
 AC_SUBST(WNCKLET_CFLAGS)
 AC_SUBST(WNCKLET_LIBS)
 
@@ -112,7 +120,7 @@
 AM_CONDITIONAL(HAVE_LIBECAL, test -n "$LIBECAL_REQUIREMENT")
 AC_SUBST(CLOCK_EDS_ICONDIR)
 
-PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED $LIBECAL_REQUIREMENT libglade-2.0 >= $LIBGLADE_REQUIRED librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED)
+PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT libglade-2.0 >= $LIBGLADE_REQUIRED librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED)
 AC_SUBST(CLOCK_CFLAGS)
 AC_SUBST(CLOCK_LIBS)
 
@@ -167,10 +175,6 @@
     AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Defined if NetworkManager support is enabled])
 fi
 
-PKG_CHECK_MODULES(FISH, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED cairo >= $CAIRO_REQUIRED)
-AC_SUBST(FISH_CFLAGS)
-AC_SUBST(FISH_LIBS)
-
 # Let distributor specify which utility to use when changing the time
 AC_ARG_WITH(clock-time-utility,
               [AC_HELP_STRING([--with-clock-time-utility],
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]