Merge lp:~3v1n0/ubuntu/oneiric/nautilus/progress-indicator-support into lp:ubuntu/oneiric/nautilus

[Marco Trevisan (Treviño)]

Added back the indicator support for the nautilus progress window, now it also shows on middle-click (indicator secondary activate) and it shows in a disabled menuitem the progress informations.

Actually the indicator is shown only when the progress window has been closed, I'd suggest to show it everytime that the transfer window loses its focus, since sometimes it goes behind a focused window and it's easily lost.

A future improvement could also to show always just an indicator with a progress-bar instead of a floating window.

[Andrea Cimitan (cimi)]

I'd rather show the progress on the unity launcher icon, looks more representative of what a "progress" is, and it's in line with other progress meters shown on the launcher (firefox downloads, transmission etc etc...).

[Marco Trevisan (Treviño) (3v1n0)]

Yes, you're right... It's the same thing I was thinking. However before doing that I preferred to update the app-indicator patch... Also, using an unity progressbar, wouldn't inform about the different progresses, but this could be easily solved by showing also the number of the transfers over the icon plus a quicklist item to bring the progress window on top in the case you want to see more accurate informations.

I'll give a look to it as soon as I can.

[Omer Akram (om26er)]

try to propose it to lp:~ubuntu-desktop/nautilus/ubuntu I think the large diff might get fixed by doing that. Might be better to talk to MPT before re-enabling the indicator IIRC there was a debate before to remove the indicator

[Marco Trevisan (Treviño) (3v1n0)]

The large diff is just caused by the fact that I also applied the patch (as all the other ones are), so the stack needs to be updated accordingly I guess.

About the design, I'm waiting an answer from mpt or others, but I'm leaving in few days so I don't know if I'll be able to finish this.

[Matthew Paul Thomas (mpt)]

Nautilus's progress window is closable even when the task has not completed. This is misleading, because it's not clear whether closing it stops or cancels the task (it does neither). It is also unnecessary, because the window is temporary and can be hidden by minimizing. The problem could easily have been fixed by making the window uncloseable, but back then applications couldn't rely on window managers following instructions.

So instead of doing that, someone added a notification area item to reopen the progress window. This did not solve the original problem, except for people who both noticed and understood the presence of the notification area item.

Then when the notification area was retired, someone reimplemented the notification area item as an application indicator. This still did not solve the problem, except for people who both noticed and understood the presence of the menu. (I am partly to blame here, because I never found time to fill in the "nautilus" item in <https://wiki.ubuntu.com/NotificationAreaTransition/CompatibilityFixes>.)

And now this branch re-adds the application indicator, while <https://code.launchpad.net/~3v1n0/ubuntu/oneiric/nautilus/unity-launcher-support/+merge/70685> adds a "Show Progress Window" quicklist item.

There really is no point in having two different ways to hide a temporary window, and two different ways to show it, where there is no difference in memory consumption, taskbar real estate, or anything else, and (worst of all) what you need to do to show the window depends on how you hid it. So please, let's just fix the root problem -- make the window uncloseable. Thanks. :-)

review: Disapprove (design)

[Sebastien Bacher (seb128)]

Thanks for your work, do you think you could rather go in the way mpt suggested there?

[Sebastien Bacher (seb128)]

hey Marco, do you still want to work on that?

[Marco Trevisan (Treviño) (3v1n0)]

Sorry Sebastien, I didn't continue to work on this since I'm just back from 15 days of holidays (where I haven't my PC with me), however this work has actually been merged in nautilus including the unity support (see https://code.launchpad.net/~3v1n0/ubuntu/oneiric/nautilus/unity-launcher-support/+merge/70685).

I guess, however, that I should revert this indicator support from the merged patch.

Unmerged revisions

237. By Marco Trevisan (Treviño) on 2011-08-06

Use Application Indicator patch updated

Updated the patch to work with current code, plus added the support
for showing the progress dialog on middle-click (secondary activate)
and a nautilus progress menu item information.

=== modified file '.pc/11_copy_skipping_pager.patch/src/nautilus-progress-ui-handler.c'
--- .pc/11_copy_skipping_pager.patch/src/nautilus-progress-ui-handler.c	2011-07-18 11:32:29 +0000
+++ .pc/11_copy_skipping_pager.patch/src/nautilus-progress-ui-handler.c	2011-08-06 03:01:32 +0000
@@ -21,6 +21,7 @@
  *
  * Authors: Alexander Larsson <[e-mail]>
  *          Cosimo Cecchi <[e-mail]>
+ *          Marco Trevisan <[e-mail]>
  *
  */
 
@@ -36,6 +37,10 @@
 
 #include <libnotify/notify.h>
 
+#ifdef HAVE_APP_INDICATOR
+#include <libappindicator/app-indicator.h>
+#endif
+
 struct _NautilusProgressUIHandlerPriv {
 	NautilusProgressInfoManager *manager;
 
@@ -45,7 +50,11 @@
 
 	gboolean notification_supports_persistence;
 	NotifyNotification *progress_notification;
+#ifdef HAVE_APP_INDICATOR
+	AppIndicator *indicator;
+#else
 	GtkStatusIcon *status_icon;
+#endif
 };
 
 G_DEFINE_TYPE (NautilusProgressUIHandler, nautilus_progress_ui_handler, G_TYPE_OBJECT);
@@ -69,6 +78,7 @@
 
 #define ACTION_DETAILS "details"
 
+#ifndef HAVE_APP_INDICATOR
 static void
 status_icon_activate_cb (GtkStatusIcon *icon,
 			 NautilusProgressUIHandler *self)
@@ -76,6 +86,7 @@
 	gtk_status_icon_set_visible (icon, FALSE);
 	gtk_window_present (GTK_WINDOW (self->priv->progress_window));
 }
+#endif
 
 static void
 notification_show_details_cb (NotifyNotification *notification,
@@ -117,6 +128,56 @@
 					NULL);
 }
 
+#ifdef HAVE_APP_INDICATOR
+
+static void
+indicator_menu_activate_cb (AppIndicator *indicator, NautilusProgressUIHandler *self)
+{
+	g_return_if_fail(self);
+	gtk_window_present (GTK_WINDOW (self->priv->progress_window));
+	app_indicator_set_status (indicator, APP_INDICATOR_STATUS_PASSIVE);
+}
+
+static void
+progress_ui_handler_ensure_indicator (NautilusProgressUIHandler *self)
+{
+	AppIndicator *indicator;
+	GtkWidget *menu;
+	GtkWidget *menuitem;
+	GtkWidget *status;
+	GtkWidget *status_sep;
+	g_return_if_fail (self);
+
+	if (self->priv->indicator != NULL) {
+		return;
+	}
+
+	indicator = app_indicator_new ("nautilus", "system-file-manager",
+                                       APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
+	menu = gtk_menu_new();
+
+	status = gtk_menu_item_new ();
+	gtk_widget_set_sensitive (status, FALSE);
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), status);
+	g_object_set_data (G_OBJECT (indicator), "status", status);
+
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new ());
+
+  	menuitem = gtk_menu_item_new_with_label (_("Show copy dialog"));
+  	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+	g_signal_connect (menuitem, "activate",
+			  (GCallback)indicator_menu_activate_cb, self);
+
+  	app_indicator_set_status (indicator, APP_INDICATOR_STATUS_PASSIVE);
+	app_indicator_set_menu (indicator, GTK_MENU (menu));
+	app_indicator_set_secondary_activate_target(indicator, menuitem);
+	gtk_widget_show_all (menu);
+
+	self->priv->indicator = indicator;
+}
+
+#else
+
 static void
 progress_ui_handler_ensure_status_icon (NautilusProgressUIHandler *self)
 {
@@ -139,6 +200,8 @@
 	self->priv->status_icon = status_icon;
 }
 
+#endif
+
 static void
 progress_ui_handler_update_notification (NautilusProgressUIHandler *self)
 {
@@ -165,17 +228,35 @@
 progress_ui_handler_update_status_icon (NautilusProgressUIHandler *self)
 {
 	gchar *tooltip;
-
-	progress_ui_handler_ensure_status_icon (self);
+	gboolean win_visible;
 
 	tooltip = g_strdup_printf (ngettext ("%'d file operation active",
 					     "%'d file operations active",
 					     self->priv->active_infos),
 				   self->priv->active_infos);
+
+	win_visible = gtk_widget_get_visible (self->priv->progress_window);
+
+#ifdef HAVE_APP_INDICATOR
+	progress_ui_handler_ensure_indicator (self);
+	GtkMenuItem *status = g_object_get_data (G_OBJECT(self->priv->indicator),
+	                                         "status");
+	gtk_menu_item_set_label (GTK_MENU_ITEM (status), tooltip);
+
+	if (!win_visible)
+		app_indicator_set_status (self->priv->indicator,
+		                          APP_INDICATOR_STATUS_ACTIVE);
+	else
+		app_indicator_set_status (self->priv->indicator,
+		                          APP_INDICATOR_STATUS_PASSIVE);
+#else
+	progress_ui_handler_ensure_status_icon (self);
+
 	gtk_status_icon_set_tooltip_text (self->priv->status_icon, tooltip);
+
+	gtk_status_icon_set_visible (self->priv->status_icon, !win_visible);
+#endif
 	g_free (tooltip);
-
-	gtk_status_icon_set_visible (self->priv->status_icon, TRUE);
 }
 
 static gboolean
@@ -195,6 +276,13 @@
 }
 
 static void
+progress_window_show_event (GtkWidget *widget, NautilusProgressUIHandler *self)
+{
+	if (!self->priv->notification_supports_persistence)
+		progress_ui_handler_update_status_icon (self);
+}
+
+static void
 progress_ui_handler_ensure_window (NautilusProgressUIHandler *self)
 {
 	GtkWidget *vbox, *progress_window;
@@ -228,6 +316,9 @@
 	g_signal_connect (progress_window,
 			  "delete-event",
 			  (GCallback) progress_window_delete_event, self);
+	g_signal_connect (progress_window,
+			  "show",
+			  (GCallback) progress_window_show_event, self);
 }
 
 static void
@@ -277,10 +368,15 @@
 static void
 progress_ui_handler_hide_notification_or_status (NautilusProgressUIHandler *self)
 {
+#ifdef HAVE_APP_INDICATOR
+	if (self->priv->indicator != NULL) {
+		app_indicator_set_status (self->priv->indicator, APP_INDICATOR_STATUS_PASSIVE);
+	}
+#else
 	if (self->priv->status_icon != NULL) {
 		gtk_status_icon_set_visible (self->priv->status_icon, FALSE);
 	}
-
+#endif
 	if (self->priv->progress_notification != NULL) {
 		notify_notification_close (self->priv->progress_notification, NULL);
 		g_clear_object (&self->priv->progress_notification);

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-07-25 16:53:10 +0000
+++ .pc/applied-patches	2011-08-06 03:01:32 +0000
@@ -3,6 +3,7 @@
 03_translations_list_update.patch
 04_suppress_umount_in_ltsp.patch
 06_never_exec_nonexec_launchers.patch
+07_use_application_indicator.patch
 08_clean_session_capplet.patch
 09_no-initial-fade.patch
 10_show_in_unity.patch

=== modified file 'Makefile.in'
--- Makefile.in	2011-06-28 11:22:30 +0000
+++ Makefile.in	2011-08-06 03:01:32 +0000
@@ -117,6 +117,8 @@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@

=== modified file 'aclocal.m4'
--- aclocal.m4	2011-06-28 11:22:30 +0000
+++ aclocal.m4	2011-08-06 03:01:32 +0000
@@ -19,6 +19,811 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+#
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <[e-mail]>, 1995, 1996
+#
+# Modified to never use included libintl. 
+# Owen Taylor <[e-mail]>, 12/15/1998
+#
+# Major rework to remove unused code
+# Owen Taylor <[e-mail]>, 12/11/2002
+#
+# Added better handling of ALL_LINGUAS from GNU gettext version 
+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+#
+# Modified to require ngettext
+# Matthias Clasen <[e-mail]> 08/06/2004
+#
+# We need this here as well, since someone might use autoconf-2.5x
+# to configure GLib then an older version to configure a package
+# using AM_GLIB_GNU_GETTEXT
+AC_PREREQ(2.53)
+
+dnl
+dnl We go to great lengths to make sure that aclocal won't 
+dnl try to pull in the installed version of these macros
+dnl when running aclocal in the glib directory.
+dnl
+m4_copy([AC_DEFUN],[glib_DEFUN])
+m4_copy([AC_REQUIRE],[glib_REQUIRE])
+dnl
+dnl At the end, if we're not within glib, we'll define the public
+dnl definitions in terms of our private definitions.
+dnl
+
+# GLIB_LC_MESSAGES
+#--------------------
+glib_DEFUN([GLIB_LC_MESSAGES],
+  [AC_CHECK_HEADERS([locale.h])
+    if test $ac_cv_header_locale_h = yes; then
+    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+    if test $am_cv_val_LC_MESSAGES = yes; then
+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
+        [Define if your <locale.h> file defines LC_MESSAGES.])
+    fi
+  fi])
+
+# GLIB_PATH_PROG_WITH_TEST
+#----------------------------
+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+  /*)
+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if [$3]; then
+	ac_cv_path_$1="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+  ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
+
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
+  dnl NLS is obligatory
+  [USE_NLS=yes
+    AC_SUBST(USE_NLS)
+
+    gt_cv_have_gettext=no
+
+    CATOBJEXT=NONE
+    XGETTEXT=:
+    INTLLIBS=
+
+    AC_CHECK_HEADER(libintl.h,
+     [gt_cv_func_dgettext_libintl="no"
+      libintl_extra_libs=""
+
+      #
+      # First check in libc
+      #
+      AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
+        [AC_TRY_LINK([
+#include <libintl.h>
+],
+         [return !ngettext ("","", 1)],
+	  gt_cv_func_ngettext_libc=yes,
+          gt_cv_func_ngettext_libc=no)
+        ])
+  
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+	      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+        	[AC_TRY_LINK([
+#include <libintl.h>
+],
+	          [return !dgettext ("","")],
+		  gt_cv_func_dgettext_libc=yes,
+	          gt_cv_func_dgettext_libc=no)
+        	])
+      fi
+  
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+        AC_CHECK_FUNCS(bind_textdomain_codeset)
+      fi
+
+      #
+      # If we don't have everything we want, check in libintl
+      #
+      if test "$gt_cv_func_dgettext_libc" != "yes" \
+	 || test "$gt_cv_func_ngettext_libc" != "yes" \
+         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+        
+        AC_CHECK_LIB(intl, bindtextdomain,
+	    [AC_CHECK_LIB(intl, ngettext,
+		    [AC_CHECK_LIB(intl, dgettext,
+			          gt_cv_func_dgettext_libintl=yes)])])
+
+	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
+	  AC_MSG_RESULT([])
+  	  AC_CHECK_LIB(intl, ngettext,
+          	[AC_CHECK_LIB(intl, dcgettext,
+		       [gt_cv_func_dgettext_libintl=yes
+			libintl_extra_libs=-liconv],
+			:,-liconv)],
+		:,-liconv)
+        fi
+
+        #
+        # If we found libintl, then check in it for bind_textdomain_codeset();
+        # we'll prefer libc if neither have bind_textdomain_codeset(),
+        # and both have dgettext and ngettext
+        #
+        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS -lintl $libintl_extra_libs"
+          unset ac_cv_func_bind_textdomain_codeset
+          AC_CHECK_FUNCS(bind_textdomain_codeset)
+          LIBS="$glib_save_LIBS"
+
+          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+            gt_cv_func_dgettext_libc=no
+          else
+            if test "$gt_cv_func_dgettext_libc" = "yes" \
+		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
+              gt_cv_func_dgettext_libintl=no
+            fi
+          fi
+        fi
+      fi
+
+      if test "$gt_cv_func_dgettext_libc" = "yes" \
+	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        gt_cv_have_gettext=yes
+      fi
+  
+      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        INTLLIBS="-lintl $libintl_extra_libs"
+      fi
+  
+      if test "$gt_cv_have_gettext" = "yes"; then
+	AC_DEFINE(HAVE_GETTEXT,1,
+	  [Define if the GNU gettext() function is already present or preinstalled.])
+	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+	if test "$MSGFMT" != "no"; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS $INTLLIBS"
+	  AC_CHECK_FUNCS(dcgettext)
+	  MSGFMT_OPTS=
+	  AC_MSG_CHECKING([if msgfmt accepts -c])
+	  GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <[e-mail]>\n"
+"Language-Team: C <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+	  AC_SUBST(MSGFMT_OPTS)
+	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+			 return _nl_msg_cat_cntr],
+	    [CATOBJEXT=.gmo 
+             DATADIRNAME=share],
+	    [case $host in
+	    *-*-solaris*)
+	    dnl On Solaris, if bind_textdomain_codeset is in libc,
+	    dnl GNU format message catalog is always supported,
+            dnl since both are added to the libc all together.
+	    dnl Hence, we'd like to go with DATADIRNAME=share and
+	    dnl and CATOBJEXT=.gmo in this case.
+            AC_CHECK_FUNC(bind_textdomain_codeset,
+	      [CATOBJEXT=.gmo 
+               DATADIRNAME=share],
+	      [CATOBJEXT=.mo
+               DATADIRNAME=lib])
+	    ;;
+	    *)
+	    CATOBJEXT=.mo
+            DATADIRNAME=lib
+	    ;;
+	    esac])
+          LIBS="$glib_save_LIBS"
+	  INSTOBJEXT=.mo
+	else
+	  gt_cv_have_gettext=no
+	fi
+      fi
+    ])
+
+    if test "$gt_cv_have_gettext" = "yes" ; then
+      AC_DEFINE(ENABLE_NLS, 1,
+        [always defined to indicate that i18n is enabled])
+    fi
+
+    dnl Test whether we really found GNU xgettext.
+    if test "$XGETTEXT" != ":"; then
+      dnl If it is not GNU xgettext we define it as : so that the
+      dnl Makefiles still can work.
+      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+        : ;
+      else
+        AC_MSG_RESULT(
+	  [found xgettext program is not GNU xgettext; ignore it])
+        XGETTEXT=":"
+      fi
+    fi
+
+    # We need to process the po/ directory.
+    POSUB=po
+
+    AC_OUTPUT_COMMANDS(
+      [case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac])
+
+    dnl These rules are solely for the distribution goal.  While doing this
+    dnl we only have to keep exactly one list of the available catalogs
+    dnl in configure.ac.
+    for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(CATALOGS)
+    AC_SUBST(CATOBJEXT)
+    AC_SUBST(DATADIRNAME)
+    AC_SUBST(GMOFILES)
+    AC_SUBST(INSTOBJEXT)
+    AC_SUBST(INTLLIBS)
+    AC_SUBST(PO_IN_DATADIR_TRUE)
+    AC_SUBST(PO_IN_DATADIR_FALSE)
+    AC_SUBST(POFILES)
+    AC_SUBST(POSUB)
+  ])
+
+# AM_GLIB_GNU_GETTEXT
+# -------------------
+# Do checks necessary for use of gettext. If a suitable implementation 
+# of gettext is found in either in libintl or in the C library,
+# it will set INTLLIBS to the libraries needed for use of gettext
+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
+# on various variables needed by the Makefile.in.in installed by 
+# glib-gettextize.
+dnl
+glib_DEFUN([GLIB_GNU_GETTEXT],
+  [AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_HEADER_STDC])dnl
+   
+   GLIB_LC_MESSAGES
+   GLIB_WITH_NLS
+
+   if test "$gt_cv_have_gettext" = "yes"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       AC_MSG_CHECKING(for catalogs to be installed)
+       NEW_LINGUAS=
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+           desiredlanguages="$LINGUAS"
+         else
+           desiredlanguages="$ALL_LINGUAS"
+         fi
+         for desiredlang in $desiredlanguages; do
+ 	   # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
+
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+   dnl Try to locate is.
+   MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
+   dnl Generate list of files to be processed by xgettext which will
+   dnl be included in po/Makefile.
+   test -d po || mkdir po
+   if test "x$srcdir" != "x."; then
+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+       posrcprefix="$srcdir/"
+     else
+       posrcprefix="../$srcdir/"
+     fi
+   else
+     posrcprefix="../"
+   fi
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
+  ])
+
+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+# -------------------------------
+# Define VARIABLE to the location where catalog files will
+# be installed by po/Makefile.
+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+glib_save_prefix="$prefix"
+glib_save_exec_prefix="$exec_prefix"
+glib_save_datarootdir="$datarootdir"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+datarootdir=`eval echo "${datarootdir}"`
+if test "x$CATOBJEXT" = "x.mo" ; then
+  localedir=`eval echo "${libdir}/locale"`
+else
+  localedir=`eval echo "${datadir}/locale"`
+fi
+prefix="$glib_save_prefix"
+exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
+AC_DEFINE_UNQUOTED($1, "$localedir",
+  [Define the location where the catalogs will be installed])
+])
+
+dnl
+dnl Now the definitions that aclocal will find
+dnl
+ifdef(glib_configure_ac,[],[
+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+])dnl
+
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+# 
+# Create a temporary file with TEST-FILE as its contents and pass the
+# file name to PROGRAM.  Perform ACTION-IF-PASS if PROGRAM exits with
+# 0 and perform ACTION-IF-FAIL for any other exit status.
+AC_DEFUN([GLIB_RUN_PROG],
+[cat >conftest.foo <<_ACEOF
+$2
+_ACEOF
+if AC_RUN_LOG([$1 conftest.foo]); then
+  m4_ifval([$3], [$3], [:])
+m4_ifvaln([$4], [else $4])dnl
+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+fi])
+
+
+dnl GLIB_GSETTINGS
+dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
+dnl the schema should be compiled
+dnl
+
+AC_DEFUN([GLIB_GSETTINGS],
+[
+  m4_pattern_allow([AM_V_GEN])
+  AC_ARG_ENABLE(schemas-compile,
+                AS_HELP_STRING([--disable-schemas-compile],
+                               [Disable regeneration of gschemas.compiled on install]),
+                [case ${enableval} in
+                  yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
+                  no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
+                 esac])
+  AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
+  PKG_PROG_PKG_CONFIG([0.16])
+  AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
+  if test x$cross_compiling != xyes; then
+    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
+  else
+    AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
+  fi
+  AC_SUBST(GLIB_COMPILE_SCHEMAS)
+  if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
+    ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
+  else
+    ifelse([$1],,[:],[$1])
+  fi
+
+  GSETTINGS_RULES='
+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
+
+mostlyclean-am: clean-gsettings-schemas
+
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+
+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
+
+all-am: $(gsettings_SCHEMAS:.xml=.valid)
+uninstall-am: uninstall-gsettings-schemas
+install-data-am: install-gsettings-schemas
+
+.SECONDARY: $(gsettings_SCHEMAS)
+
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
+	@$(NORMAL_INSTALL)
+	if test -n "$^"; then \
+		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+	fi
+
+uninstall-gsettings-schemas:
+	@$(NORMAL_UNINSTALL)
+	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
+	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+
+clean-gsettings-schemas:
+	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
+endif
+'
+  _GSETTINGS_SUBST(GSETTINGS_RULES)
+])
+
+dnl _GSETTINGS_SUBST(VARIABLE)
+dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+AC_DEFUN([_GSETTINGS_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
+dnl -*- mode: autoconf -*-
+dnl Copyright 2009 Johan Dahlin
+dnl
+dnl This file is free software; the author(s) gives unlimited
+dnl permission to copy and/or distribute it, with or without
+dnl modifications, as long as this notice is preserved.
+dnl
+
+# serial 1
+
+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
+[
+    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
+
+    dnl enable/disable introspection
+    m4_if([$2], [require],
+    [dnl
+        enable_introspection=yes
+    ],[dnl
+        AC_ARG_ENABLE(introspection,
+                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
+                                 [Enable introspection for this build]),, 
+                                 [enable_introspection=auto])
+    ])dnl
+
+    AC_MSG_CHECKING([for gobject-introspection])
+
+    dnl presence/version checking
+    AS_CASE([$enable_introspection],
+    [no], [dnl
+        found_introspection="no (disabled, use --enable-introspection to enable)"
+    ],dnl
+    [yes],[dnl
+        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
+                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
+                         found_introspection=yes,
+                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
+    ],dnl
+    [auto],[dnl
+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
+    ],dnl
+    [dnl	
+        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
+    ])dnl
+
+    AC_MSG_RESULT([$found_introspection])
+
+    INTROSPECTION_SCANNER=
+    INTROSPECTION_COMPILER=
+    INTROSPECTION_GENERATE=
+    INTROSPECTION_GIRDIR=
+    INTROSPECTION_TYPELIBDIR=
+    if test "x$found_introspection" = "xyes"; then
+       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+    fi
+    AC_SUBST(INTROSPECTION_SCANNER)
+    AC_SUBST(INTROSPECTION_COMPILER)
+    AC_SUBST(INTROSPECTION_GENERATE)
+    AC_SUBST(INTROSPECTION_GIRDIR)
+    AC_SUBST(INTROSPECTION_TYPELIBDIR)
+    AC_SUBST(INTROSPECTION_CFLAGS)
+    AC_SUBST(INTROSPECTION_LIBS)
+    AC_SUBST(INTROSPECTION_MAKEFILE)
+
+    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
+])
+
+
+dnl Usage:
+dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
+
+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
+[
+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
+])
+
+dnl Usage:
+dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
+
+
+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
+[
+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
+])
+
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <[e-mail]>, 1995-2000.
+dnl   Bruno Haible <[e-mail]>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE([nls],
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT([$USE_NLS])
+  AC_SUBST([USE_NLS])
+])
+
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <[e-mail]>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
 # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -1033,809 +1838,6 @@
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <[e-mail]>, 1995-2000.
-dnl   Bruno Haible <[e-mail]>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE([nls],
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT([$USE_NLS])
-  AC_SUBST([USE_NLS])
-])
-
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <[e-mail]>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])
-        ])
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
-#
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-#
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <[e-mail]>, 1995, 1996
-#
-# Modified to never use included libintl. 
-# Owen Taylor <[e-mail]>, 12/15/1998
-#
-# Major rework to remove unused code
-# Owen Taylor <[e-mail]>, 12/11/2002
-#
-# Added better handling of ALL_LINGUAS from GNU gettext version 
-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-#
-# Modified to require ngettext
-# Matthias Clasen <[e-mail]> 08/06/2004
-#
-# We need this here as well, since someone might use autoconf-2.5x
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
-
-dnl
-dnl We go to great lengths to make sure that aclocal won't 
-dnl try to pull in the installed version of these macros
-dnl when running aclocal in the glib directory.
-dnl
-m4_copy([AC_DEFUN],[glib_DEFUN])
-m4_copy([AC_REQUIRE],[glib_REQUIRE])
-dnl
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
-
-# GLIB_LC_MESSAGES
-#--------------------
-glib_DEFUN([GLIB_LC_MESSAGES],
-  [AC_CHECK_HEADERS([locale.h])
-    if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
-    fi
-  fi])
-
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN([GLIB_WITH_NLS],
-  dnl NLS is obligatory
-  [USE_NLS=yes
-    AC_SUBST(USE_NLS)
-
-    gt_cv_have_gettext=no
-
-    CATOBJEXT=NONE
-    XGETTEXT=:
-    INTLLIBS=
-
-    AC_CHECK_HEADER(libintl.h,
-     [gt_cv_func_dgettext_libintl="no"
-      libintl_extra_libs=""
-
-      #
-      # First check in libc
-      #
-      AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
-        [AC_TRY_LINK([
-#include <libintl.h>
-],
-         [return !ngettext ("","", 1)],
-	  gt_cv_func_ngettext_libc=yes,
-          gt_cv_func_ngettext_libc=no)
-        ])
-  
-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-	      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-        	[AC_TRY_LINK([
-#include <libintl.h>
-],
-	          [return !dgettext ("","")],
-		  gt_cv_func_dgettext_libc=yes,
-	          gt_cv_func_dgettext_libc=no)
-        	])
-      fi
-  
-      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-        AC_CHECK_FUNCS(bind_textdomain_codeset)
-      fi
-
-      #
-      # If we don't have everything we want, check in libintl
-      #
-      if test "$gt_cv_func_dgettext_libc" != "yes" \
-	 || test "$gt_cv_func_ngettext_libc" != "yes" \
-         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-        
-        AC_CHECK_LIB(intl, bindtextdomain,
-	    [AC_CHECK_LIB(intl, ngettext,
-		    [AC_CHECK_LIB(intl, dgettext,
-			          gt_cv_func_dgettext_libintl=yes)])])
-
-	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
-	  AC_MSG_RESULT([])
-  	  AC_CHECK_LIB(intl, ngettext,
-          	[AC_CHECK_LIB(intl, dcgettext,
-		       [gt_cv_func_dgettext_libintl=yes
-			libintl_extra_libs=-liconv],
-			:,-liconv)],
-		:,-liconv)
-        fi
-
-        #
-        # If we found libintl, then check in it for bind_textdomain_codeset();
-        # we'll prefer libc if neither have bind_textdomain_codeset(),
-        # and both have dgettext and ngettext
-        #
-        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS -lintl $libintl_extra_libs"
-          unset ac_cv_func_bind_textdomain_codeset
-          AC_CHECK_FUNCS(bind_textdomain_codeset)
-          LIBS="$glib_save_LIBS"
-
-          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-            gt_cv_func_dgettext_libc=no
-          else
-            if test "$gt_cv_func_dgettext_libc" = "yes" \
-		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
-              gt_cv_func_dgettext_libintl=no
-            fi
-          fi
-        fi
-      fi
-
-      if test "$gt_cv_func_dgettext_libc" = "yes" \
-	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        gt_cv_have_gettext=yes
-      fi
-  
-      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        INTLLIBS="-lintl $libintl_extra_libs"
-      fi
-  
-      if test "$gt_cv_have_gettext" = "yes"; then
-	AC_DEFINE(HAVE_GETTEXT,1,
-	  [Define if the GNU gettext() function is already present or preinstalled.])
-	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	if test "$MSGFMT" != "no"; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS $INTLLIBS"
-	  AC_CHECK_FUNCS(dcgettext)
-	  MSGFMT_OPTS=
-	  AC_MSG_CHECKING([if msgfmt accepts -c])
-	  GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: test 1.0\n"
-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-"Last-Translator: test <[e-mail]>\n"
-"Language-Team: C <[e-mail]>\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
-	  AC_SUBST(MSGFMT_OPTS)
-	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			 return _nl_msg_cat_cntr],
-	    [CATOBJEXT=.gmo 
-             DATADIRNAME=share],
-	    [case $host in
-	    *-*-solaris*)
-	    dnl On Solaris, if bind_textdomain_codeset is in libc,
-	    dnl GNU format message catalog is always supported,
-            dnl since both are added to the libc all together.
-	    dnl Hence, we'd like to go with DATADIRNAME=share and
-	    dnl and CATOBJEXT=.gmo in this case.
-            AC_CHECK_FUNC(bind_textdomain_codeset,
-	      [CATOBJEXT=.gmo 
-               DATADIRNAME=share],
-	      [CATOBJEXT=.mo
-               DATADIRNAME=lib])
-	    ;;
-	    *)
-	    CATOBJEXT=.mo
-            DATADIRNAME=lib
-	    ;;
-	    esac])
-          LIBS="$glib_save_LIBS"
-	  INSTOBJEXT=.mo
-	else
-	  gt_cv_have_gettext=no
-	fi
-      fi
-    ])
-
-    if test "$gt_cv_have_gettext" = "yes" ; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [always defined to indicate that i18n is enabled])
-    fi
-
-    dnl Test whether we really found GNU xgettext.
-    if test "$XGETTEXT" != ":"; then
-      dnl If it is not GNU xgettext we define it as : so that the
-      dnl Makefiles still can work.
-      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-        : ;
-      else
-        AC_MSG_RESULT(
-	  [found xgettext program is not GNU xgettext; ignore it])
-        XGETTEXT=":"
-      fi
-    fi
-
-    # We need to process the po/ directory.
-    POSUB=po
-
-    AC_OUTPUT_COMMANDS(
-      [case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac])
-
-    dnl These rules are solely for the distribution goal.  While doing this
-    dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.ac.
-    for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(CATALOGS)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
-    AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLLIBS)
-    AC_SUBST(PO_IN_DATADIR_TRUE)
-    AC_SUBST(PO_IN_DATADIR_FALSE)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
-  ])
-
-# AM_GLIB_GNU_GETTEXT
-# -------------------
-# Do checks necessary for use of gettext. If a suitable implementation 
-# of gettext is found in either in libintl or in the C library,
-# it will set INTLLIBS to the libraries needed for use of gettext
-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-# on various variables needed by the Makefile.in.in installed by 
-# glib-gettextize.
-dnl
-glib_DEFUN([GLIB_GNU_GETTEXT],
-  [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   
-   GLIB_LC_MESSAGES
-   GLIB_WITH_NLS
-
-   if test "$gt_cv_have_gettext" = "yes"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
-         useit=no
-         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-           desiredlanguages="$LINGUAS"
-         else
-           desiredlanguages="$ALL_LINGUAS"
-         fi
-         for desiredlang in $desiredlanguages; do
- 	   # Use the presentlang catalog if desiredlang is
-           #   a. equal to presentlang, or
-           #   b. a variant of presentlang (because in this case,
-           #      presentlang can be used as a fallback for messages
-           #      which are not translated in the desiredlang catalog).
-           case "$desiredlang" in
-             "$presentlang"*) useit=yes;;
-           esac
-         done
-         if test $useit = yes; then
-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-         fi
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-   dnl Try to locate is.
-   MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
-   AC_SUBST(MKINSTALLDIRS)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
-  ])
-
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
-# Define VARIABLE to the location where catalog files will
-# be installed by po/Makefile.
-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-glib_save_prefix="$prefix"
-glib_save_exec_prefix="$exec_prefix"
-glib_save_datarootdir="$datarootdir"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-datarootdir=`eval echo "${datarootdir}"`
-if test "x$CATOBJEXT" = "x.mo" ; then
-  localedir=`eval echo "${libdir}/locale"`
-else
-  localedir=`eval echo "${datadir}/locale"`
-fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-datarootdir="$glib_save_datarootdir"
-AC_DEFINE_UNQUOTED($1, "$localedir",
-  [Define the location where the catalogs will be installed])
-])
-
-dnl
-dnl Now the definitions that aclocal will find
-dnl
-ifdef(glib_configure_ac,[],[
-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-])dnl
-
-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
-# 
-# Create a temporary file with TEST-FILE as its contents and pass the
-# file name to PROGRAM.  Perform ACTION-IF-PASS if PROGRAM exits with
-# 0 and perform ACTION-IF-FAIL for any other exit status.
-AC_DEFUN([GLIB_RUN_PROG],
-[cat >conftest.foo <<_ACEOF
-$2
-_ACEOF
-if AC_RUN_LOG([$1 conftest.foo]); then
-  m4_ifval([$3], [$3], [:])
-m4_ifvaln([$4], [else $4])dnl
-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
-fi])
-
-
-dnl GLIB_GSETTINGS
-dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
-dnl the schema should be compiled
-dnl
-
-AC_DEFUN([GLIB_GSETTINGS],
-[
-  m4_pattern_allow([AM_V_GEN])
-  AC_ARG_ENABLE(schemas-compile,
-                AS_HELP_STRING([--disable-schemas-compile],
-                               [Disable regeneration of gschemas.compiled on install]),
-                [case ${enableval} in
-                  yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
-                  no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
-                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
-                 esac])
-  AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
-  PKG_PROG_PKG_CONFIG([0.16])
-  AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
-  if test x$cross_compiling != xyes; then
-    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
-  else
-    AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
-  fi
-  AC_SUBST(GLIB_COMPILE_SCHEMAS)
-  if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
-    ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
-  else
-    ifelse([$1],,[:],[$1])
-  fi
-
-  GSETTINGS_RULES='
-.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
-
-mostlyclean-am: clean-gsettings-schemas
-
-gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
-
-%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
-	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
-
-all-am: $(gsettings_SCHEMAS:.xml=.valid)
-uninstall-am: uninstall-gsettings-schemas
-install-data-am: install-gsettings-schemas
-
-.SECONDARY: $(gsettings_SCHEMAS)
-
-install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
-	@$(NORMAL_INSTALL)
-	if test -n "$^"; then \
-		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
-		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
-		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
-	fi
-
-uninstall-gsettings-schemas:
-	@$(NORMAL_UNINSTALL)
-	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
-	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
-
-clean-gsettings-schemas:
-	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
-
-ifdef gsettings_ENUM_NAMESPACE
-$(gsettings__enum_file): $(gsettings_ENUM_FILES)
-	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
-endif
-'
-  _GSETTINGS_SUBST(GSETTINGS_RULES)
-])
-
-dnl _GSETTINGS_SUBST(VARIABLE)
-dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-AC_DEFUN([_GSETTINGS_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-dnl -*- mode: autoconf -*-
-dnl Copyright 2009 Johan Dahlin
-dnl
-dnl This file is free software; the author(s) gives unlimited
-dnl permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
-dnl
-
-# serial 1
-
-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-[
-    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-
-    dnl enable/disable introspection
-    m4_if([$2], [require],
-    [dnl
-        enable_introspection=yes
-    ],[dnl
-        AC_ARG_ENABLE(introspection,
-                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-                                 [Enable introspection for this build]),, 
-                                 [enable_introspection=auto])
-    ])dnl
-
-    AC_MSG_CHECKING([for gobject-introspection])
-
-    dnl presence/version checking
-    AS_CASE([$enable_introspection],
-    [no], [dnl
-        found_introspection="no (disabled, use --enable-introspection to enable)"
-    ],dnl
-    [yes],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-                         found_introspection=yes,
-                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-    ],dnl
-    [auto],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
-    ],dnl
-    [dnl	
-        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-    ])dnl
-
-    AC_MSG_RESULT([$found_introspection])
-
-    INTROSPECTION_SCANNER=
-    INTROSPECTION_COMPILER=
-    INTROSPECTION_GENERATE=
-    INTROSPECTION_GIRDIR=
-    INTROSPECTION_TYPELIBDIR=
-    if test "x$found_introspection" = "xyes"; then
-       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-    fi
-    AC_SUBST(INTROSPECTION_SCANNER)
-    AC_SUBST(INTROSPECTION_COMPILER)
-    AC_SUBST(INTROSPECTION_GENERATE)
-    AC_SUBST(INTROSPECTION_GIRDIR)
-    AC_SUBST(INTROSPECTION_TYPELIBDIR)
-    AC_SUBST(INTROSPECTION_CFLAGS)
-    AC_SUBST(INTROSPECTION_LIBS)
-    AC_SUBST(INTROSPECTION_MAKEFILE)
-
-    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-])
-
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-
-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-])
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-
-
-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-])
-
 m4_include([m4/gtk-doc.m4])
 m4_include([m4/intltool.m4])
 m4_include([m4/libtool.m4])

=== modified file 'config.h.in'
--- config.h.in	2011-05-16 18:53:51 +0000
+++ config.h.in	2011-08-06 03:01:32 +0000
@@ -24,6 +24,9 @@
 /* Define the location where the catalogs will be installed */
 #undef GNOMELOCALEDIR
 
+/* Have AppIndicator */
+#undef HAVE_APP_INDICATOR
+
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET
 

=== modified file 'configure'
--- configure	2011-07-25 16:53:10 +0000
+++ configure	2011-08-06 03:01:32 +0000
@@ -638,6 +638,10 @@
 BASE_LIBS
 BASE_CFLAGS
 WARNING_CFLAGS
+APP_INDICATOR_LIBS
+APP_INDICATOR_CFLAGS
+HAVE_APP_INDICATOR_FALSE
+HAVE_APP_INDICATOR_TRUE
 ENABLE_EMPTY_VIEW_FALSE
 ENABLE_EMPTY_VIEW_TRUE
 ENABLE_EMPTY_VIEW
@@ -862,6 +866,7 @@
 enable_xmp
 enable_empty_view
 enable_packagekit
+enable_appindicator
 enable_more_warnings
 enable_introspection
 enable_update_mimedb
@@ -884,6 +889,8 @@
 EXIF_LIBS
 EXEMPI_CFLAGS
 EXEMPI_LIBS
+APP_INDICATOR_CFLAGS
+APP_INDICATOR_LIBS
 BASE_CFLAGS
 BASE_LIBS
 COMMON_CFLAGS
@@ -1534,6 +1541,7 @@
   --disable-xmp           build without xmp support
   --enable-empty-view     Enable empty view
   --disable-packagekit    build without PackageKit support
+  --disable-appindicator  build without appindicator support
   --enable-more-warnings  Maximum compiler warnings
   --enable-introspection=[no/auto/yes]
                           Enable introspection for this build
@@ -1573,6 +1581,10 @@
   EXEMPI_CFLAGS
               C compiler flags for EXEMPI, overriding pkg-config
   EXEMPI_LIBS linker flags for EXEMPI, overriding pkg-config
+  APP_INDICATOR_CFLAGS
+              C compiler flags for APP_INDICATOR, overriding pkg-config
+  APP_INDICATOR_LIBS
+              linker flags for APP_INDICATOR, overriding pkg-config
   BASE_CFLAGS C compiler flags for BASE, overriding pkg-config
   BASE_LIBS   linker flags for BASE, overriding pkg-config
   COMMON_CFLAGS
@@ -13787,6 +13799,7 @@
 
 
 
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -14736,6 +14749,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14752,6 +14766,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -14771,9 +14786,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>&1`
+	        GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>&1`
         else
-	        GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>&1`
+	        GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTKDOC_DEPS_PKG_ERRORS" >&5
@@ -14788,7 +14803,6 @@
 Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
 and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
-
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -14804,7 +14818,6 @@
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
-
 else
 	GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS
 	GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS
@@ -15092,6 +15105,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EXIF_CFLAGS=`$PKG_CONFIG --cflags "libexif >= 0.6.20" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15108,6 +15122,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EXIF_LIBS=`$PKG_CONFIG --libs "libexif >= 0.6.20" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15127,9 +15142,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libexif >= 0.6.20" 2>&1`
+	        EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libexif >= 0.6.20" 2>&1`
         else
-	        EXIF_PKG_ERRORS=`$PKG_CONFIG --print-errors "libexif >= 0.6.20" 2>&1`
+	        EXIF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libexif >= 0.6.20" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EXIF_PKG_ERRORS" >&5
@@ -15208,6 +15223,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EXEMPI_CFLAGS=`$PKG_CONFIG --cflags "exempi-2.0 >= 2.1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15224,6 +15240,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EXEMPI_LIBS=`$PKG_CONFIG --libs "exempi-2.0 >= 2.1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15243,9 +15260,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EXEMPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "exempi-2.0 >= 2.1.0" 2>&1`
+	        EXEMPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "exempi-2.0 >= 2.1.0" 2>&1`
         else
-	        EXEMPI_PKG_ERRORS=`$PKG_CONFIG --print-errors "exempi-2.0 >= 2.1.0" 2>&1`
+	        EXEMPI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "exempi-2.0 >= 2.1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EXEMPI_PKG_ERRORS" >&5
@@ -15447,6 +15464,129 @@
 
 
 
+ if false; then
+  HAVE_APP_INDICATOR_TRUE=
+  HAVE_APP_INDICATOR_FALSE='#'
+else
+  HAVE_APP_INDICATOR_TRUE='#'
+  HAVE_APP_INDICATOR_FALSE=
+fi
+
+
+# Check whether --enable-appindicator was given.
+if test "${enable_appindicator+set}" = set; then :
+  enableval=$enable_appindicator;
+fi
+
+
+msg_appindicator=no
+if test "x$enable_appindicator" != "xno"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APP_INDICATOR" >&5
+$as_echo_n "checking for APP_INDICATOR... " >&6; }
+
+if test -n "$APP_INDICATOR_CFLAGS"; then
+    pkg_cv_APP_INDICATOR_CFLAGS="$APP_INDICATOR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator3-0.1 >= 0.3.90\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "appindicator3-0.1 >= 0.3.90") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_APP_INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "appindicator3-0.1 >= 0.3.90" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$APP_INDICATOR_LIBS"; then
+    pkg_cv_APP_INDICATOR_LIBS="$APP_INDICATOR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator3-0.1 >= 0.3.90\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "appindicator3-0.1 >= 0.3.90") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_APP_INDICATOR_LIBS=`$PKG_CONFIG --libs "appindicator3-0.1 >= 0.3.90" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        APP_INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "appindicator3-0.1 >= 0.3.90" 2>&1`
+        else
+	        APP_INDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "appindicator3-0.1 >= 0.3.90" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$APP_INDICATOR_PKG_ERRORS" >&5
+
+	 if 0; then
+  HAVE_APP_INDICATOR_TRUE=
+  HAVE_APP_INDICATOR_FALSE='#'
+else
+  HAVE_APP_INDICATOR_TRUE='#'
+  HAVE_APP_INDICATOR_FALSE=
+fi
+
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	 if 0; then
+  HAVE_APP_INDICATOR_TRUE=
+  HAVE_APP_INDICATOR_FALSE='#'
+else
+  HAVE_APP_INDICATOR_TRUE='#'
+  HAVE_APP_INDICATOR_FALSE=
+fi
+
+
+else
+	APP_INDICATOR_CFLAGS=$pkg_cv_APP_INDICATOR_CFLAGS
+	APP_INDICATOR_LIBS=$pkg_cv_APP_INDICATOR_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                      if 1; then
+  HAVE_APP_INDICATOR_TRUE=
+  HAVE_APP_INDICATOR_FALSE='#'
+else
+  HAVE_APP_INDICATOR_TRUE='#'
+  HAVE_APP_INDICATOR_FALSE=
+fi
+
+
+$as_echo "#define HAVE_APP_INDICATOR 1" >>confdefs.h
+
+
+                     msg_appindicator=yes
+fi
+
+
+fi
+
+
+
 WARNING_CFLAGS=""
 
 # Check whether --enable-more-warnings was given.
@@ -15573,6 +15713,7 @@
 	gtk+-3.0 >= 3.1.6
 	glib-2.0 >= 2.29.13
 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15598,6 +15739,7 @@
 	gtk+-3.0 >= 3.1.6
 	glib-2.0 >= 2.29.13
 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15617,12 +15759,12 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        BASE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
+	        BASE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
 	gtk+-3.0 >= 3.1.6
 	glib-2.0 >= 2.29.13
 " 2>&1`
         else
-	        BASE_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+	        BASE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
 	gtk+-3.0 >= 3.1.6
 	glib-2.0 >= 2.29.13
 " 2>&1`
@@ -15643,7 +15785,6 @@
 Alternatively, you may set the environment variables BASE_CFLAGS
 and BASE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
-
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -15659,7 +15800,6 @@
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
-
 else
 	BASE_CFLAGS=$pkg_cv_BASE_CFLAGS
 	BASE_LIBS=$pkg_cv_BASE_LIBS
@@ -15701,6 +15841,7 @@
 	libxml-2.0 >= 2.7.8
 	x11
 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15732,6 +15873,7 @@
 	libxml-2.0 >= 2.7.8
 	x11
 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15751,14 +15893,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        COMMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
+	        COMMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
 	gail-3.0
 	gnome-desktop-3.0 >= 3.0.0
 	libxml-2.0 >= 2.7.8
 	x11
 " 2>&1`
         else
-	        COMMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+	        COMMON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
 	gail-3.0
 	gnome-desktop-3.0 >= 3.0.0
 	libxml-2.0 >= 2.7.8
@@ -15783,7 +15925,6 @@
 Alternatively, you may set the environment variables COMMON_CFLAGS
 and COMMON_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
-
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -15799,7 +15940,6 @@
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
-
 else
 	COMMON_CFLAGS=$pkg_cv_COMMON_CFLAGS
 	COMMON_LIBS=$pkg_cv_COMMON_LIBS
@@ -15826,6 +15966,7 @@
 	gio-unix-2.0 >= 2.29.13
 	gsettings-desktop-schemas
 	libnotify >= 0.7.0
+	launchpad-integration-3.0
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
 	gthread-2.0 >= 2.29.13
@@ -15833,6 +15974,7 @@
 	gio-unix-2.0 >= 2.29.13
 	gsettings-desktop-schemas
 	libnotify >= 0.7.0
+	launchpad-integration-3.0
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -15843,7 +15985,9 @@
 	gio-unix-2.0 >= 2.29.13
 	gsettings-desktop-schemas
 	libnotify >= 0.7.0
+	launchpad-integration-3.0
 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15860,6 +16004,7 @@
 	gio-unix-2.0 >= 2.29.13
 	gsettings-desktop-schemas
 	libnotify >= 0.7.0
+	launchpad-integration-3.0
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
 	gthread-2.0 >= 2.29.13
@@ -15867,6 +16012,7 @@
 	gio-unix-2.0 >= 2.29.13
 	gsettings-desktop-schemas
 	libnotify >= 0.7.0
+	launchpad-integration-3.0
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -15877,7 +16023,9 @@
 	gio-unix-2.0 >= 2.29.13
 	gsettings-desktop-schemas
 	libnotify >= 0.7.0
+	launchpad-integration-3.0
 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15897,20 +16045,22 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
+	        NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
 	gthread-2.0 >= 2.29.13
 	gio-2.0 >= 2.29.13
 	gio-unix-2.0 >= 2.29.13
 	gsettings-desktop-schemas
 	libnotify >= 0.7.0
+	launchpad-integration-3.0
 " 2>&1`
         else
-	        NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+	        NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
 	gthread-2.0 >= 2.29.13
 	gio-2.0 >= 2.29.13
 	gio-unix-2.0 >= 2.29.13
 	gsettings-desktop-schemas
 	libnotify >= 0.7.0
+	launchpad-integration-3.0
 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -15922,6 +16072,7 @@
 	gio-unix-2.0 >= 2.29.13
 	gsettings-desktop-schemas
 	libnotify >= 0.7.0
+	launchpad-integration-3.0
 ) were not met:
 
 $NAUTILUS_PKG_ERRORS
@@ -15932,7 +16083,6 @@
 Alternatively, you may set the environment variables NAUTILUS_CFLAGS
 and NAUTILUS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
-
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -15948,7 +16098,6 @@
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
-
 else
 	NAUTILUS_CFLAGS=$pkg_cv_NAUTILUS_CFLAGS
 	NAUTILUS_LIBS=$pkg_cv_NAUTILUS_LIBS
@@ -16337,6 +16486,22 @@
   as_fn_error $? "conditional \"ENABLE_EMPTY_VIEW\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_APP_INDICATOR_TRUE}" && test -z "${HAVE_APP_INDICATOR_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_APP_INDICATOR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_APP_INDICATOR_TRUE}" && test -z "${HAVE_APP_INDICATOR_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_APP_INDICATOR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_APP_INDICATOR_TRUE}" && test -z "${HAVE_APP_INDICATOR_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_APP_INDICATOR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_APP_INDICATOR_TRUE}" && test -z "${HAVE_APP_INDICATOR_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_APP_INDICATOR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18650,6 +18815,7 @@
 	libexif support:	$msg_libexif
 	libexempi support:	$msg_xmp
 	PackageKit support:     $msg_packagekit
+	AppIndicator support:	$msg_appindicator
 	nautilus-sendto ext:	$enable_nst_extension
 
 	profiling support:      ${profiling_support}

=== modified file 'configure.in'
--- configure.in	2011-07-25 16:53:10 +0000
+++ configure.in	2011-08-06 03:01:32 +0000
@@ -10,6 +10,7 @@
 m4_define(exif_minver,                 0.6.20)
 m4_define(exempi_minver,               2.1.0)
 m4_define(notify_minver,               0.7.0)
+m4_define(appindicator_minver,         0.3.90)
 
 
 dnl 1. If the library code has changed at all since last release, then increment revision.
@@ -203,6 +204,29 @@
 
 dnl ==========================================================================
 
+
+AM_CONDITIONAL(HAVE_APP_INDICATOR, false)
+
+AC_ARG_ENABLE(appindicator,
+	AC_HELP_STRING([--disable-appindicator],
+			[build without appindicator support]))
+
+msg_appindicator=no
+if test "x$enable_appindicator" != "xno"; then
+	PKG_CHECK_MODULES(APP_INDICATOR,
+		appindicator3-0.1 >= appindicator_minver, [
+                     AM_CONDITIONAL(HAVE_APP_INDICATOR, 1)
+                     AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator])
+                     ]
+                     msg_appindicator=yes,
+                     [AM_CONDITIONAL(HAVE_APP_INDICATOR, 0)
+                     ])
+   		AC_SUBST(APP_INDICATOR_CFLAGS)
+   		AC_SUBST(APP_INDICATOR_LIBS)
+fi
+
+dnl ==========================================================================
+
 dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
 
 WARNING_CFLAGS=""
@@ -360,6 +384,7 @@
 	libexif support:	$msg_libexif
 	libexempi support:	$msg_xmp
 	PackageKit support:     $msg_packagekit
+	AppIndicator support:	$msg_appindicator
 	nautilus-sendto ext:	$enable_nst_extension
 
 	profiling support:      ${profiling_support}

=== modified file 'cut-n-paste-code/Makefile.in'
--- cut-n-paste-code/Makefile.in	2011-06-28 11:22:30 +0000
+++ cut-n-paste-code/Makefile.in	2011-08-06 03:01:32 +0000
@@ -100,6 +100,8 @@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@

=== modified file 'cut-n-paste-code/libegg/Makefile.in'
--- cut-n-paste-code/libegg/Makefile.in	2011-06-28 11:22:30 +0000
+++ cut-n-paste-code/libegg/Makefile.in	2011-08-06 03:01:32 +0000
@@ -96,6 +96,8 @@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@

=== modified file 'data/Makefile.in'
--- data/Makefile.in	2011-06-28 11:22:30 +0000
+++ data/Makefile.in	2011-08-06 03:01:32 +0000
@@ -130,6 +130,8 @@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@

=== modified file 'data/icons/Makefile.in'
--- data/icons/Makefile.in	2011-06-28 11:22:30 +0000
+++ data/icons/Makefile.in	2011-08-06 03:01:32 +0000
@@ -62,6 +62,8 @@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@

=== modified file 'data/nautilus.desktop.in'
--- data/nautilus.desktop.in	2011-07-25 16:53:10 +0000
+++ data/nautilus.desktop.in	2011-08-06 03:01:32 +0000
@@ -6,7 +6,7 @@
 Terminal=false
 Type=Application
 StartupNotify=true
-OnlyShowIn=GNOME;
+OnlyShowIn=GNOME;Unity;
 Categories=GNOME;GTK;Utility;Core;
 MimeType=inode/directory;application/x-gnome-saved-search;
 X-GNOME-Bugzilla-Bugzilla=GNOME

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-02 15:32:01 +0000
+++ debian/changelog	2011-08-06 03:01:32 +0000
@@ -1,3 +1,11 @@
+nautilus (1:3.1.4-0ubuntu3) oneiric; urgency=low
+
+  * debian/patches/07_use_application_indicator.patch:
+    Updated to work with current implementation, added middle-click and
+    transfer information support
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Sat, 06 Aug 2011 04:51:04 +0200
+
 nautilus (1:3.1.4-0ubuntu2) oneiric; urgency=low
 
   * debian/rules: don't install nautilus.css, it breaks themes

=== modified file 'debian/patches/07_use_application_indicator.patch'
--- debian/patches/07_use_application_indicator.patch	2011-05-16 18:53:51 +0000
+++ debian/patches/07_use_application_indicator.patch	2011-08-06 03:01:32 +0000
@@ -1,23 +1,23 @@
 Description: Use the application-indicator
 Bug: https://bugs.edge.launchpad.net/ubuntu/+source/nautilus/+bug/497880 
 
-Index: nautilus-2.31.6/configure.in
+Index: nautilus/configure.in
 ===================================================================
---- nautilus-2.31.6.orig/configure.in	2010-08-12 16:39:33.000000000 +0200
-+++ nautilus-2.31.6/configure.in	2010-08-12 16:39:37.000000000 +0200
-@@ -11,7 +11,7 @@
- m4_define(exempi_minver,               1.99.2)
- m4_define(exempi_minver_newapi,        1.99.5)
- m4_define(gail_minver,                 0.16)
--
-+m4_define(appindicator_minver,         0.0.2)
+--- nautilus.orig/configure.in	2011-08-06 04:44:21.062809449 +0200
++++ nautilus/configure.in	2011-08-06 04:45:23.332026621 +0200
+@@ -10,6 +10,7 @@
+ m4_define(exif_minver,                 0.6.20)
+ m4_define(exempi_minver,               2.1.0)
+ m4_define(notify_minver,               0.7.0)
++m4_define(appindicator_minver,         0.3.90)
+ 
  
  dnl 1. If the library code has changed at all since last release, then increment revision.
- dnl 2. If any interfaces have been added, then increment current and set revision to 0.
-@@ -234,6 +234,28 @@
+@@ -203,6 +204,29 @@
  
  dnl ==========================================================================
  
++
 +AM_CONDITIONAL(HAVE_APP_INDICATOR, false)
 +
 +AC_ARG_ENABLE(appindicator,
@@ -27,7 +27,7 @@
 +msg_appindicator=no
 +if test "x$enable_appindicator" != "xno"; then
 +	PKG_CHECK_MODULES(APP_INDICATOR,
-+		appindicator-0.1 >= appindicator_minver, [
++		appindicator3-0.1 >= appindicator_minver, [
 +                     AM_CONDITIONAL(HAVE_APP_INDICATOR, 1)
 +                     AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator])
 +                     ]
@@ -36,185 +36,236 @@
 +                     ])
 +   		AC_SUBST(APP_INDICATOR_CFLAGS)
 +   		AC_SUBST(APP_INDICATOR_LIBS)
-+fi			
++fi
 +
 +dnl ==========================================================================
 +
  dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
  
  WARNING_CFLAGS=""
-@@ -416,7 +438,8 @@
- 	compiler:		${CC}
- 	xmp support:		$msg_xmp
+@@ -360,6 +384,7 @@
+ 	libexif support:	$msg_libexif
+ 	libexempi support:	$msg_xmp
  	PackageKit support:     $msg_packagekit
--
 +	AppIndicator support:	$msg_appindicator
-+	
+ 	nautilus-sendto ext:	$enable_nst_extension
+ 
  	profiling support:      ${profiling_support}
- 	nautilus-extension documentation: ${enable_gtk_doc}
- 	nautilus-extension introspection: ${found_introspection}
-Index: nautilus-2.31.6/libnautilus-private/Makefile.am
-===================================================================
---- nautilus-2.31.6.orig/libnautilus-private/Makefile.am	2010-08-12 12:20:55.000000000 +0200
-+++ nautilus-2.31.6/libnautilus-private/Makefile.am	2010-08-12 16:39:37.000000000 +0200
-@@ -11,6 +11,7 @@
- 	$(DISABLE_DEPRECATED_CFLAGS)			\
- 	$(TRACKER_CFLAGS)				\
- 	$(BEAGLE_CFLAGS)				\
-+	$(APP_INDICATOR_CFLAGS)				\
- 	-DDATADIR=\""$(datadir)"\" 			\
- 	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
- 	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" 	\
-@@ -33,6 +34,7 @@
- 	$(top_builddir)/eel/libeel-2.la \
- 	$(top_builddir)/libnautilus-extension/libnautilus-extension.la \
- 	$(CORE_LIBS)			\
-+	$(APP_INDICATOR_LIBS)		\
- 	$(NULL)
- 
- marshal_sources = \
-Index: nautilus-2.31.6/libnautilus-private/Makefile.in
-===================================================================
---- nautilus-2.31.6.orig/libnautilus-private/Makefile.in	2010-08-12 12:21:31.000000000 +0200
-+++ nautilus-2.31.6/libnautilus-private/Makefile.in	2010-08-12 16:39:37.000000000 +0200
-@@ -169,6 +169,8 @@
- ALL_LINGUAS = @ALL_LINGUAS@
- AMTAR = @AMTAR@
- AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
-+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
- AR = @AR@
- AS = @AS@
- AUTOCONF = @AUTOCONF@
-@@ -364,6 +366,7 @@
- 	$(DISABLE_DEPRECATED_CFLAGS)			\
- 	$(TRACKER_CFLAGS)				\
- 	$(BEAGLE_CFLAGS)				\
-+	$(APP_INDICATOR_CFLAGS)				\
- 	-DDATADIR=\""$(datadir)"\" 			\
- 	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
- 	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" 	\
-@@ -386,6 +389,7 @@
- 	$(top_builddir)/eel/libeel-2.la \
- 	$(top_builddir)/libnautilus-extension/libnautilus-extension.la \
- 	$(CORE_LIBS)			\
-+	$(APP_INDICATOR_LIBS)		\
- 	$(NULL)
- 
- marshal_sources = \
-Index: nautilus-2.31.6/libnautilus-private/nautilus-progress-info.c
-===================================================================
---- nautilus-2.31.6.orig/libnautilus-private/nautilus-progress-info.c	2010-08-12 12:20:55.000000000 +0200
-+++ nautilus-2.31.6/libnautilus-private/nautilus-progress-info.c	2010-08-12 16:39:37.000000000 +0200
-@@ -30,6 +30,11 @@
- #include <eel/eel-glib-extensions.h>
- #include "nautilus-progress-info.h"
- 
-+
+Index: nautilus/src/Makefile.am
+===================================================================
+--- nautilus.orig/src/Makefile.am	2011-08-06 04:45:14.342139636 +0200
++++ nautilus/src/Makefile.am	2011-08-06 04:45:23.332026621 +0200
+@@ -30,6 +30,7 @@
+ 	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
+ 	-DVERSION="\"$(VERSION)\"" 				\
+ 	$(DISABLE_DEPRECATED_CFLAGS)                            \
++	$(APP_INDICATOR_CFLAGS)                                 \
+ 	$(NULL)
+ 
+ LDADD =\
+@@ -41,6 +42,7 @@
+ 	$(EXIF_LIBS) \
+ 	$(EXEMPI_LIBS) \
+ 	$(POPT_LIBS) \
++	$(APP_INDICATOR_LIBS) \
+ 	$(NULL)
+ 
+ nautilus_SOURCES = \
+Index: nautilus/src/nautilus-progress-ui-handler.c
+===================================================================
+--- nautilus.orig/src/nautilus-progress-ui-handler.c	2011-08-06 04:44:27.562727733 +0200
++++ nautilus/src/nautilus-progress-ui-handler.c	2011-08-06 04:45:23.332026621 +0200
+@@ -21,6 +21,7 @@
+  *
+  * Authors: Alexander Larsson <[e-mail]>
+  *          Cosimo Cecchi <[e-mail]>
++ *          Marco Trevisan <[e-mail]>
+  *
+  */
+ 
+@@ -36,6 +37,10 @@
+ 
+ #include <libnotify/notify.h>
+ 
 +#ifdef HAVE_APP_INDICATOR
 +#include <libappindicator/app-indicator.h>
 +#endif
 +
- enum {
-   CHANGED,
-   PROGRESS_CHANGED,
-@@ -77,7 +82,11 @@
- 
- static GList *active_progress_infos = NULL;
- 
+ struct _NautilusProgressUIHandlerPriv {
+ 	NautilusProgressInfoManager *manager;
+ 
+@@ -45,7 +50,11 @@
+ 
+ 	gboolean notification_supports_persistence;
+ 	NotifyNotification *progress_notification;
 +#ifdef HAVE_APP_INDICATOR
-+static AppIndicator *indicator = NULL;
++	AppIndicator *indicator;
 +#else
- static GtkStatusIcon *status_icon = NULL;
+ 	GtkStatusIcon *status_icon;
 +#endif
- static int n_progress_ops = 0;
- 
- 
-@@ -193,6 +202,14 @@
- 	return TRUE;
- }
- 
-+#ifdef HAVE_APP_INDICATOR
-+static void
-+indicator_icon_activate_cb (AppIndicator *icon,
-+			 GtkWidget *progress_window)
-+{
-+	gtk_window_present (GTK_WINDOW (progress_window));
-+}
-+#else
+ };
+ 
+ G_DEFINE_TYPE (NautilusProgressUIHandler, nautilus_progress_ui_handler, G_TYPE_OBJECT);
+@@ -69,6 +78,7 @@
+ 
+ #define ACTION_DETAILS "details"
+ 
++#ifndef HAVE_APP_INDICATOR
  static void
  status_icon_activate_cb (GtkStatusIcon *icon,
- 			 GtkWidget *progress_window)
-@@ -203,12 +220,16 @@
- 		gtk_window_present (GTK_WINDOW (progress_window));
- 	}
+ 			 NautilusProgressUIHandler *self)
+@@ -76,6 +86,7 @@
+ 	gtk_status_icon_set_visible (icon, FALSE);
+ 	gtk_window_present (GTK_WINDOW (self->priv->progress_window));
  }
 +#endif
  
- static GtkWidget *
- get_progress_window (void)
- {
- 	static GtkWidget *progress_window = NULL;
- 	GtkWidget *vbox;
-+#ifdef HAVE_APP_INDICATOR	
-+	GtkWidget *indicator_menu, *indicator_menuitem;
-+#endif
- 	
- 	if (progress_window != NULL) {
- 		return progress_window;
-@@ -240,13 +261,27 @@
- 			  "delete_event",
- 			  (GCallback)delete_event, NULL);
+ static void
+ notification_show_details_cb (NotifyNotification *notification,
+@@ -117,6 +128,56 @@
+ 					NULL);
+ }
  
 +#ifdef HAVE_APP_INDICATOR
-+  	indicator = app_indicator_new ("nautilus", "system-file-manager",
-+                                 APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-+
-+  	indicator_menu = gtk_menu_new();
-+  	indicator_menuitem = gtk_menu_item_new_with_label (_("Show copy dialog"));
-+  	gtk_menu_shell_append (indicator_menu, indicator_menuitem);
-+	g_signal_connect (indicator_menuitem, "activate",
-+			  (GCallback)indicator_icon_activate_cb,
-+			  progress_window);  	
++
++static void
++indicator_menu_activate_cb (AppIndicator *indicator, NautilusProgressUIHandler *self)
++{
++	g_return_if_fail(self);
++	gtk_window_present (GTK_WINDOW (self->priv->progress_window));
++	app_indicator_set_status (indicator, APP_INDICATOR_STATUS_PASSIVE);
++}
++
++static void
++progress_ui_handler_ensure_indicator (NautilusProgressUIHandler *self)
++{
++	AppIndicator *indicator;
++	GtkWidget *menu;
++	GtkWidget *menuitem;
++	GtkWidget *status;
++	GtkWidget *status_sep;
++	g_return_if_fail (self);
++
++	if (self->priv->indicator != NULL) {
++		return;
++	}
++
++	indicator = app_indicator_new ("nautilus", "system-file-manager",
++                                       APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
++	menu = gtk_menu_new();
++
++	status = gtk_menu_item_new ();
++	gtk_widget_set_sensitive (status, FALSE);
++	gtk_menu_shell_append (GTK_MENU_SHELL (menu), status);
++	g_object_set_data (G_OBJECT (indicator), "status", status);
++
++	gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new ());
++
++  	menuitem = gtk_menu_item_new_with_label (_("Show copy dialog"));
++  	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
++	g_signal_connect (menuitem, "activate",
++			  (GCallback)indicator_menu_activate_cb, self);
++
 +  	app_indicator_set_status (indicator, APP_INDICATOR_STATUS_PASSIVE);
-+	app_indicator_set_menu (indicator, GTK_MENU (indicator_menu));
-+	gtk_widget_show_all (indicator_menu);
-+#else	
- 	status_icon = gtk_status_icon_new_from_icon_name ("system-file-manager");
- 	g_signal_connect (status_icon, "activate",
- 			  (GCallback)status_icon_activate_cb,
- 			  progress_window);
- 
- 	gtk_status_icon_set_visible (status_icon, FALSE);
--	
-+#endif	
- 	return progress_window;
- }
- 
-@@ -296,6 +331,18 @@
- 	}
- }
- 
++	app_indicator_set_menu (indicator, GTK_MENU (menu));
++	app_indicator_set_secondary_activate_target(indicator, menuitem);
++	gtk_widget_show_all (menu);
++
++	self->priv->indicator = indicator;
++}
++
++#else
++
+ static void
+ progress_ui_handler_ensure_status_icon (NautilusProgressUIHandler *self)
+ {
+@@ -139,6 +200,8 @@
+ 	self->priv->status_icon = status_icon;
+ }
+ 
++#endif
++
+ static void
+ progress_ui_handler_update_notification (NautilusProgressUIHandler *self)
+ {
+@@ -165,17 +228,35 @@
+ progress_ui_handler_update_status_icon (NautilusProgressUIHandler *self)
+ {
+ 	gchar *tooltip;
+-
+-	progress_ui_handler_ensure_status_icon (self);
++	gboolean win_visible;
+ 
+ 	tooltip = g_strdup_printf (ngettext ("%'d file operation active",
+ 					     "%'d file operations active",
+ 					     self->priv->active_infos),
+ 				   self->priv->active_infos);
++
++	win_visible = gtk_widget_get_visible (self->priv->progress_window);
++
 +#ifdef HAVE_APP_INDICATOR
++	progress_ui_handler_ensure_indicator (self);
++	GtkMenuItem *status = g_object_get_data (G_OBJECT(self->priv->indicator),
++	                                         "status");
++	gtk_menu_item_set_label (GTK_MENU_ITEM (status), tooltip);
++
++	if (!win_visible)
++		app_indicator_set_status (self->priv->indicator,
++		                          APP_INDICATOR_STATUS_ACTIVE);
++	else
++		app_indicator_set_status (self->priv->indicator,
++		                          APP_INDICATOR_STATUS_PASSIVE);
++#else
++	progress_ui_handler_ensure_status_icon (self);
++
+ 	gtk_status_icon_set_tooltip_text (self->priv->status_icon, tooltip);
+-	g_free (tooltip);
+ 
+-	gtk_status_icon_set_visible (self->priv->status_icon, TRUE);
++	gtk_status_icon_set_visible (self->priv->status_icon, !win_visible);
++#endif
++	g_free (tooltip);
+ }
+ 
+ static gboolean
+@@ -195,6 +276,13 @@
+ }
+ 
+ static void
++progress_window_show_event (GtkWidget *widget, NautilusProgressUIHandler *self)
++{
++	if (!self->priv->notification_supports_persistence)
++		progress_ui_handler_update_status_icon (self);
++}
++
 +static void
-+update_status_icon_and_window (void)
-+{
-+	if (n_progress_ops == 0) {
-+		app_indicator_set_status (indicator, APP_INDICATOR_STATUS_PASSIVE);
-+		gtk_widget_hide (get_progress_window ());
-+	} else {
-+  		app_indicator_set_status (indicator, APP_INDICATOR_STATUS_ACTIVE);
+ progress_ui_handler_ensure_window (NautilusProgressUIHandler *self)
+ {
+ 	GtkWidget *vbox, *progress_window;
+@@ -228,6 +316,9 @@
+ 	g_signal_connect (progress_window,
+ 			  "delete-event",
+ 			  (GCallback) progress_window_delete_event, self);
++	g_signal_connect (progress_window,
++			  "show",
++			  (GCallback) progress_window_show_event, self);
+ }
+ 
+ static void
+@@ -277,10 +368,15 @@
+ static void
+ progress_ui_handler_hide_notification_or_status (NautilusProgressUIHandler *self)
+ {
++#ifdef HAVE_APP_INDICATOR
++	if (self->priv->indicator != NULL) {
++		app_indicator_set_status (self->priv->indicator, APP_INDICATOR_STATUS_PASSIVE);
 +	}
-+}
 +#else
- static void
- update_status_icon_and_window (void)
- {
-@@ -315,6 +362,7 @@
- 		gtk_status_icon_set_visible (status_icon, TRUE);
+ 	if (self->priv->status_icon != NULL) {
+ 		gtk_status_icon_set_visible (self->priv->status_icon, FALSE);
  	}
- }
+-
 +#endif
- 
- static void
- op_finished (ProgressWidgetData *data)
+ 	if (self->priv->progress_notification != NULL) {
+ 		notify_notification_close (self->priv->progress_notification, NULL);
+ 		g_clear_object (&self->priv->progress_notification);

=== modified file 'debian/patches/11_copy_skipping_pager.patch'
--- debian/patches/11_copy_skipping_pager.patch	2011-07-18 11:32:29 +0000
+++ debian/patches/11_copy_skipping_pager.patch	2011-08-06 03:01:32 +0000
@@ -1,8 +1,8 @@
-Index: nautilus-3.1.3/src/nautilus-progress-ui-handler.c
+Index: nautilus/src/nautilus-progress-ui-handler.c
 ===================================================================
---- nautilus-3.1.3.orig/src/nautilus-progress-ui-handler.c	2011-07-18 11:16:03.139187027 +0200
-+++ nautilus-3.1.3/src/nautilus-progress-ui-handler.c	2011-07-18 11:16:58.303460573 +0200
-@@ -217,6 +217,8 @@
+--- nautilus.orig/src/nautilus-progress-ui-handler.c	2011-08-06 04:45:23.332026621 +0200
++++ nautilus/src/nautilus-progress-ui-handler.c	2011-08-06 04:46:02.201537962 +0200
+@@ -305,6 +305,8 @@
  				 GTK_WIN_POS_CENTER);
  	gtk_window_set_icon_name (GTK_WINDOW (progress_window),
  				"system-file-manager");

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-07-25 16:53:10 +0000
+++ debian/patches/series	2011-08-06 03:01:32 +0000
@@ -4,7 +4,7 @@
 04_suppress_umount_in_ltsp.patch
 #05_desktop_menu_export.patch
 06_never_exec_nonexec_launchers.patch
-#07_use_application_indicator.patch
+07_use_application_indicator.patch
 08_clean_session_capplet.patch
 09_no-initial-fade.patch
 10_show_in_unity.patch

=== modified file 'docs/Makefile.in'
--- docs/Makefile.in	2011-06-28 11:22:30 +0000
+++ docs/Makefile.in	2011-08-06 03:01:32 +0000
@@ -125,6 +125,8 @@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@

=== modified file 'docs/reference/Makefile.in'
--- docs/reference/Makefile.in	2011-06-28 11:22:30 +0000
+++ docs/reference/Makefile.in	2011-08-06 03:01:32 +0000
@@ -100,6 +100,8 @@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@

=== modified file 'docs/reference/libnautilus-extension/Makefile.in'
--- docs/reference/libnautilus-extension/Makefile.in	2011-06-28 11:22:30 +0000
+++ docs/reference/libnautilus-extension/Makefile.in	2011-08-06 03:01:32 +0000
@@ -67,6 +67,8 @@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@

=== modified file 'eel/Makefile.in'
--- eel/Makefile.in	2011-07-04 18:16:54 +0000
+++ eel/Makefile.in	2011-08-06 03:01:32 +0000
@@ -114,6 +114,8 @@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@

=== modified file 'icons/Makefile.in'
--- icons/Makefile.in	2011-06-28 11:22:30 +0000
+++ icons/Makefile.in	2011-08-06 03:01:32 +0000
@@ -84,6 +84,8 @@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@

=== modified file 'libnautilus-extension/Makefile.in'
--- libnautilus-extension/Makefile.in	2011-06-28 11:22:30 +0000
+++ libnautilus-extension/Makefile.in	2011-08-06 03:01:32 +0000
@@ -137,6 +137,8 @@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@

=== modified file 'libnautilus-private/Makefile.in'
--- libnautilus-private/Makefile.in	2011-07-04 18:16:54 +0000
+++ libnautilus-private/Makefile.in	2011-08-06 03:01:32 +0000
@@ -169,6 +169,8 @@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@

=== modified file 'nautilus-sendto-extension/Makefile.in'
--- nautilus-sendto-extension/Makefile.in	2011-06-28 11:22:30 +0000
+++ nautilus-sendto-extension/Makefile.in	2011-08-06 03:01:32 +0000
@@ -120,6 +120,8 @@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-07-04 18:16:54 +0000
+++ src/Makefile.am	2011-08-06 03:01:32 +0000
@@ -30,6 +30,7 @@
 	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
 	-DVERSION="\"$(VERSION)\"" 				\
 	$(DISABLE_DEPRECATED_CFLAGS)                            \
+	$(APP_INDICATOR_CFLAGS)                                 \
 	$(NULL)
 
 LDADD =\
@@ -41,6 +42,7 @@
 	$(EXIF_LIBS) \
 	$(EXEMPI_LIBS) \
 	$(POPT_LIBS) \
+	$(APP_INDICATOR_LIBS) \
 	$(NULL)
 
 nautilus_SOURCES = \

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2011-07-04 18:16:54 +0000
+++ src/Makefile.in	2011-08-06 03:01:32 +0000
@@ -160,7 +160,8 @@
 	$(top_builddir)/libnautilus-private/libnautilus-private.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
@@ -173,7 +174,8 @@
 	$(top_builddir)/libnautilus-private/libnautilus-private.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_nautilus_connect_server_OBJECTS = nautilus-bookmark-list.$(OBJEXT) \
 	nautilus-connect-server-dialog.$(OBJEXT) \
 	nautilus-connect-server-dialog-main.$(OBJEXT) \
@@ -185,7 +187,8 @@
 	$(top_builddir)/libnautilus-private/libnautilus-private.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am_nautilus_convert_metadata_OBJECTS =  \
 	nautilus-convert-metadata.$(OBJEXT) $(am__objects_1)
 nautilus_convert_metadata_OBJECTS =  \
@@ -195,7 +198,8 @@
 	$(top_builddir)/libnautilus-private/libnautilus-private.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -260,6 +264,8 @@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -455,6 +461,7 @@
 	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
 	-DVERSION="\"$(VERSION)\"" 				\
 	$(DISABLE_DEPRECATED_CFLAGS)                            \
+	$(APP_INDICATOR_CFLAGS)                                 \
 	$(NULL)
 
 LDADD = \
@@ -466,6 +473,7 @@
 	$(EXIF_LIBS) \
 	$(EXEMPI_LIBS) \
 	$(POPT_LIBS) \
+	$(APP_INDICATOR_LIBS) \
 	$(NULL)
 
 nautilus_SOURCES = nautilus-actions.h nautilus-application.c \

=== modified file 'src/nautilus-progress-ui-handler.c'
--- src/nautilus-progress-ui-handler.c	2011-07-18 11:32:29 +0000
+++ src/nautilus-progress-ui-handler.c	2011-08-06 03:01:32 +0000
@@ -21,6 +21,7 @@
  *
  * Authors: Alexander Larsson <[e-mail]>
  *          Cosimo Cecchi <[e-mail]>
+ *          Marco Trevisan <[e-mail]>
  *
  */
 
@@ -36,6 +37,10 @@
 
 #include <libnotify/notify.h>
 
+#ifdef HAVE_APP_INDICATOR
+#include <libappindicator/app-indicator.h>
+#endif
+
 struct _NautilusProgressUIHandlerPriv {
 	NautilusProgressInfoManager *manager;
 
@@ -45,7 +50,11 @@
 
 	gboolean notification_supports_persistence;
 	NotifyNotification *progress_notification;
+#ifdef HAVE_APP_INDICATOR
+	AppIndicator *indicator;
+#else
 	GtkStatusIcon *status_icon;
+#endif
 };
 
 G_DEFINE_TYPE (NautilusProgressUIHandler, nautilus_progress_ui_handler, G_TYPE_OBJECT);
@@ -69,6 +78,7 @@
 
 #define ACTION_DETAILS "details"
 
+#ifndef HAVE_APP_INDICATOR
 static void
 status_icon_activate_cb (GtkStatusIcon *icon,
 			 NautilusProgressUIHandler *self)
@@ -76,6 +86,7 @@
 	gtk_status_icon_set_visible (icon, FALSE);
 	gtk_window_present (GTK_WINDOW (self->priv->progress_window));
 }
+#endif
 
 static void
 notification_show_details_cb (NotifyNotification *notification,
@@ -117,6 +128,56 @@
 					NULL);
 }
 
+#ifdef HAVE_APP_INDICATOR
+
+static void
+indicator_menu_activate_cb (AppIndicator *indicator, NautilusProgressUIHandler *self)
+{
+	g_return_if_fail(self);
+	gtk_window_present (GTK_WINDOW (self->priv->progress_window));
+	app_indicator_set_status (indicator, APP_INDICATOR_STATUS_PASSIVE);
+}
+
+static void
+progress_ui_handler_ensure_indicator (NautilusProgressUIHandler *self)
+{
+	AppIndicator *indicator;
+	GtkWidget *menu;
+	GtkWidget *menuitem;
+	GtkWidget *status;
+	GtkWidget *status_sep;
+	g_return_if_fail (self);
+
+	if (self->priv->indicator != NULL) {
+		return;
+	}
+
+	indicator = app_indicator_new ("nautilus", "system-file-manager",
+                                       APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
+	menu = gtk_menu_new();
+
+	status = gtk_menu_item_new ();
+	gtk_widget_set_sensitive (status, FALSE);
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), status);
+	g_object_set_data (G_OBJECT (indicator), "status", status);
+
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new ());
+
+  	menuitem = gtk_menu_item_new_with_label (_("Show copy dialog"));
+  	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+	g_signal_connect (menuitem, "activate",
+			  (GCallback)indicator_menu_activate_cb, self);
+
+  	app_indicator_set_status (indicator, APP_INDICATOR_STATUS_PASSIVE);
+	app_indicator_set_menu (indicator, GTK_MENU (menu));
+	app_indicator_set_secondary_activate_target(indicator, menuitem);
+	gtk_widget_show_all (menu);
+
+	self->priv->indicator = indicator;
+}
+
+#else
+
 static void
 progress_ui_handler_ensure_status_icon (NautilusProgressUIHandler *self)
 {
@@ -139,6 +200,8 @@
 	self->priv->status_icon = status_icon;
 }
 
+#endif
+
 static void
 progress_ui_handler_update_notification (NautilusProgressUIHandler *self)
 {
@@ -165,17 +228,35 @@
 progress_ui_handler_update_status_icon (NautilusProgressUIHandler *self)
 {
 	gchar *tooltip;
-
-	progress_ui_handler_ensure_status_icon (self);
+	gboolean win_visible;
 
 	tooltip = g_strdup_printf (ngettext ("%'d file operation active",
 					     "%'d file operations active",
 					     self->priv->active_infos),
 				   self->priv->active_infos);
+
+	win_visible = gtk_widget_get_visible (self->priv->progress_window);
+
+#ifdef HAVE_APP_INDICATOR
+	progress_ui_handler_ensure_indicator (self);
+	GtkMenuItem *status = g_object_get_data (G_OBJECT(self->priv->indicator),
+	                                         "status");
+	gtk_menu_item_set_label (GTK_MENU_ITEM (status), tooltip);
+
+	if (!win_visible)
+		app_indicator_set_status (self->priv->indicator,
+		                          APP_INDICATOR_STATUS_ACTIVE);
+	else
+		app_indicator_set_status (self->priv->indicator,
+		                          APP_INDICATOR_STATUS_PASSIVE);
+#else
+	progress_ui_handler_ensure_status_icon (self);
+
 	gtk_status_icon_set_tooltip_text (self->priv->status_icon, tooltip);
+
+	gtk_status_icon_set_visible (self->priv->status_icon, !win_visible);
+#endif
 	g_free (tooltip);
-
-	gtk_status_icon_set_visible (self->priv->status_icon, TRUE);
 }
 
 static gboolean
@@ -195,6 +276,13 @@
 }
 
 static void
+progress_window_show_event (GtkWidget *widget, NautilusProgressUIHandler *self)
+{
+	if (!self->priv->notification_supports_persistence)
+		progress_ui_handler_update_status_icon (self);
+}
+
+static void
 progress_ui_handler_ensure_window (NautilusProgressUIHandler *self)
 {
 	GtkWidget *vbox, *progress_window;
@@ -230,6 +318,9 @@
 	g_signal_connect (progress_window,
 			  "delete-event",
 			  (GCallback) progress_window_delete_event, self);
+	g_signal_connect (progress_window,
+			  "show",
+			  (GCallback) progress_window_show_event, self);
 }
 
 static void
@@ -279,10 +370,15 @@
 static void
 progress_ui_handler_hide_notification_or_status (NautilusProgressUIHandler *self)
 {
+#ifdef HAVE_APP_INDICATOR
+	if (self->priv->indicator != NULL) {
+		app_indicator_set_status (self->priv->indicator, APP_INDICATOR_STATUS_PASSIVE);
+	}
+#else
 	if (self->priv->status_icon != NULL) {
 		gtk_status_icon_set_visible (self->priv->status_icon, FALSE);
 	}
-
+#endif
 	if (self->priv->progress_notification != NULL) {
 		notify_notification_close (self->priv->progress_notification, NULL);
 		g_clear_object (&self->priv->progress_notification);

=== modified file 'test/Makefile.in'
--- test/Makefile.in	2011-06-28 11:22:30 +0000
+++ test/Makefile.in	2011-08-06 03:01:32 +0000
@@ -129,6 +129,8 @@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@