Remove unused patches.

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

5 files changed, 15 insertions, 255 deletions

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index 824a1d3c165e..3a9f5ad8eb31 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/cinnamon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.14 2012/09/09 00:31:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.15 2012/09/09 00:36:03 tetromino Exp $
+
+  09 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/cinnamon-1.1.3-extensionjs_path.patch,
+  -files/cinnamon-1.1.3-xdg-open.patch,
+  -files/cinnamon-1.2-optional-networkmanager.patch:
+  Remove unused patches.
 
 *cinnamon-1.4_p1 (09 Sep 2012)
 
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index a1354d3c2b30..7b82ba1d7c75 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -2,9 +2,6 @@
 Hash: SHA256
 
 AUX cinnamon-1.1.3-automagic-gnome-bluetooth.patch 1841 SHA256 df5f86858b8abc08225ffb7679e829250e05a419b439b2ecad0f02bd93b670b2 SHA512 43848dd5d04c3d3162d38f12c742d96b44061184ee946a502bf61952e17f11a57722163dcf59c1b78086c047dfc6d2c3046bd4c975fcf45ca565a2ed099802bd WHIRLPOOL 410f10e1bf87d90a33d193d726041e8cf5d66513a6ba31082bc57dbf9aefbb04c5ca3c1ba691ab60da99f2eb0319a3c55f2ecb205616779a113652fe838fc4b6
-AUX cinnamon-1.1.3-extensionjs_path.patch 1136 SHA256 a937cfd70a6c5e63cc74d0b72387fd6b3d9f4286e42b2c9615b7f8f458cab19c SHA512 10814cc79f4a886459b2bc4cfeaff4a69d3c34b2504714f678a7927ab609eee9a7f11dba43d002c0ec4edf4915310b43213ade369f717515fb05a56795252c03 WHIRLPOOL 6225ccc79d527b2b2bd6fc43763aac7ebc355d1384024c9026c3a6522bbcadc8d39432c78c9437f7b812321c7155828f9b23f350d3535400530968f883d3d52d
-AUX cinnamon-1.1.3-xdg-open.patch 944 SHA256 87ec3b57829107e1d3cb56cd75bf3d1125c71193a14087296bfce3f18780b7d5 SHA512 01f06882b9d656b9ab7287fdd4f9974b2a0b708649dba67345d1704f0845f52131e320f07633b698cad3466dd84d3dcb166699754db0d94b6e79c1879da755c1 WHIRLPOOL ede0340579d2cfde642bb77f9b3db22e103274e2afd6d68221e21a669d6855f7a931fdde2e1a472ffb4326f57d00c8bab2277d679037191685327399a21768e7
-AUX cinnamon-1.2-optional-networkmanager.patch 7316 SHA256 04773bf99e82c477474a8a8b42baff8ca5f76afb78bd57ac6cfa44d4885dac1d SHA512 26d84ac96dc2bab51b72a10adb9430f9a7fa9d44ff2b1b2dfc552322f0e6c9f7e1a64d31ed1736be6393ec75402d0d8e894cb69e09ef70072bb55f39a40e3e2c WHIRLPOOL 87eca41c272d9e181710e209a671fcb0c25c997eacbe50fd22f38afa28dee1f3668123eec07f7275fca5c29ba94d4ecab5e4ab3ee852247cdfd1f7b3a509c288
 AUX cinnamon-1.3.1-optional-networkmanager.patch 6649 SHA256 37bb34e61dbf4700d1a7ff92a47b1544a35edf3fc4eb5d863c295e2372613f01 SHA512 bdd89422fc63d1b89c8978aa2e7d9e1f83704fe1464340ec03a8c895fad8a86b3166acc4dc4f6ca4e45f773e1dc97c463b4f783e04a3d4d667d7be454088d5f4 WHIRLPOOL ad8ba167eaac8137eadfe327fc40d69374e2aa943b8e29da1f4abe56fdb7d70985eeec6ee4af1ed959d2e24cea069a9508216dea8e295868cbde91e50884348f
 AUX cinnamon-1.4-UP1-gnome-bluetooth-3.4-1.patch 1659 SHA256 b150aee8e4fd7960f91163c2303ee9d384b42c1c0380b7ddff1be77ebcc8ad9a SHA512 2b4a75627253d700cde52749d28c7a79306b04ab0a9dd2f89fc33de21c58c39b16ae31a21476403b888151f8b3011539e799892f84776a4ad25c9b72fb5af00e WHIRLPOOL 9d557e9d8be485d936eaec35d28538b06edb424af368b5bc1c35b23a7aa8be47cac949eb12326ad4d02be016a6fb9adaccb3afa9bff2d40b089fbce53c34a4a7
 AUX cinnamon-1.4-UP1-gnome-bluetooth-3.4-2.patch 892 SHA256 484f10998ae07fa31bb81fd0f520d430bd9bca210a99ea7ca26fd828edb45db2 SHA512 dfb63801e47d13b00a70b8618649bd3a8a8152eb67c93923388f574542406e24a25e9afb7d6b27a28e16164059af474aba0155f6fc72a1d6f6833069b12fd57f WHIRLPOOL e1e46f63ffe6beff29c9ce13f00ecfe6a5f8edcccbf7c0d54291c5221124397cbd49017028b6ff7088a25281a8073fcd6ceaa28d28f3bcc3fb13ff259c510529
@@ -12,16 +9,16 @@ DIST cinnamon-1.4-UP1.tar.gz 2639484 SHA256 a684d479729879fe257704eb7466e2b194fb
 DIST cinnamon-1.4.tar.gz 2639153 SHA256 26fa922bfd73d3b8f4c954e6b79b97450bd6be4875680acafd823814bfd6d20f SHA512 a8f7efe5d903316975e7205806b0e49c152c78b508ca591e0341987e1cfe5bedd1d0d3dcded4972d019b41899a41e95e0d8510977c34a579c02ae7ad69b15f9b WHIRLPOOL 480578fe0d6bc6a178744ee6df837f96e368ce78e86001c934aeeeec348cd99b0417efe538d19c79fe8360cda1924b0842c3bbd1c039e16ac22d3143d3cd2343
 EBUILD cinnamon-1.4.ebuild 7986 SHA256 54dfecf342233b6dc369ba29631951a72811cba9cba1d6623617886d5f10bc55 SHA512 7bf5c6370059509b8598261c2f4e1757ee23eba0a6e99e693363a05e30c403f03af21b19aacc975b7460799eb4802a18254cf04b9ca31552385d308ece230090 WHIRLPOOL 2a4bd8bcc8ae9b54e3e9de8d5154cbbb084875d8a3ad9eaad53df804b75ce10e1f385a9acdc2f9de2025b3cd665599c0f077c66bb96bc67a689786f75207edba
 EBUILD cinnamon-1.4_p1.ebuild 8143 SHA256 cf19ae3730236a6651b3b73d3532330a419e0121a694104c4ebc87ed75275d88 SHA512 375152441946574e60644811852fbed61f5a8bc894a652815d37aadd453d5265716909c213d5a8b02197b03292c447fdbb92dfda6ff62d85383be0443e664240 WHIRLPOOL 6985edc276d02128cac48cf684ab7d9089b7cf5095fbaf3f8e353d0af03c53a1b020ee7d6663e1527667f9e9e4b8d9745345ebcfe07c1a317490e921c5bd642c
-MISC ChangeLog 3371 SHA256 6a11004d51311463b92e25810218d2ca8428d7d8bca668de7dccf9480d5f9881 SHA512 f22a7e39f3e41f51824afba43d055847fcc600d525d7d496641c41c512564185ece65f191447f35d6730cba0e4d8ccc99411f8607e2da387e5b59391eefd00b3 WHIRLPOOL 2a5bc5c7fb7dbbfba5be106c2664a24f2e59b6caed97478237a86e15e1dd1f3ee054fd99b2e059b14439c2dfba05799c26fb35c4a88d863b0650a38eec23398b
+MISC ChangeLog 3597 SHA256 cc66688631cee25cb477cf819a80792f131d24d692619e8d1e79692428153612 SHA512 9ca7000d37b9d96697941b074d36074425412d714b44a2f7edd37719e710e9b3ac39434ce025058424b9a7e8c6ac833e7d30c22bddabdc799fb89b5e403c0365 WHIRLPOOL 0e15a846f7b42cc0947f4aa1bfb1bcda8c99d51e2ffbda21b705f08faa57a7a1c6ebcdaac3401c375a3d427f41cbd3f3dee247a4381f40623f433d27fca90efb
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQS+OEAAoJEJ0WA1zPCt1hEmQH/0TO1bWI9PbSMiIksn4A3m3w
-tK0W4dK7s6JJVGkJHchp0qphG1rNK8dU7IC4kGZSUyHByzwQf+bjcYlmfHQ3TcNO
-F8XUErvo7QKnZdBp4FBNT3bAZHC35C7DHmThyIub7Eki8yGCR3c+6Z7w3T/nOnKV
-+ADL5OG06DxJJdNfBlo6tzRAZomS4KkmCoXtPXhRpJ2ajrdPNUGIRu020l7oMFz/
-SQIBUu/uM0K6r0ILFuUP/6OKw0Y8P77XOrElwoonwwxJcfLbBmmeMNwwQBWT5202
-2adqdeEv9SmPIlUuA/NJnR3oitv4unoy1GQiEA4Rf1laj4GlaEzuGVmAsOGMStA=
-=PwLa
+iQEcBAEBCAAGBQJQS+R4AAoJEJ0WA1zPCt1h4fQH/1WYhMI5fAVr+dRLuE7Jnsv1
+cHxtpB7E8ZD27ygbgnGKNl2WjHtDck6fOOVU9gkyjknhfwgfFR6dFBaH85uTYkvK
+aC4r0asFCtTeRX21Z6KSEZV9Yn1nw81Xcx75NS0TMmbYXtLS3HvBNRq5apP0orV1
+/lrtPgAhVOKtLIk1z1VM6Hhb8ZEivnvYkIz5EL8fQSrBqAwKVV4iGVW9U7IdqRsP
+/LZY+pnMyUYvo7ZGILqH/jLG9C8kaK0UAHgy6mm4fbdoUOJWw3yoZsHTVJFycmM3
+G580GJEhocRxZABpO+2I5xVWk5K9gqRFhgFXh8iE9C+icRS7fegzBpH44zjlWQQ=
+=UPN2
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.1.3-extensionjs_path.patch b/gnome-extra/cinnamon/files/cinnamon-1.1.3-extensionjs_path.patch
deleted file mode 100644
index ff42f22bd181..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-1.1.3-extensionjs_path.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b64739844de4d84032b69ecd04f0fbe1d452f311 Mon Sep 17 00:00:00 2001
-From: "Jasper St. Pierre" <jstpierre@mecheye.net>
-Date: Thu, 13 Oct 2011 00:46:46 -0400
-Subject: [PATCH 03/28] gnome-shell-extension-tool: Fix error after creating
- extension
-
-Commit 7a8a00c7057d56350d4b5509cefd812a67d4b7d7 cleaned up the code to move all
-files to a dictionary, which accidentally left an undefined "extensionjs_path"
-error. Fix that error.
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: port to cinnamon]
-
-https://bugzilla.gnome.org/show_bug.cgi?id=661623
----
- src/cinnamon-extension-tool.in |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/cinnamon-extension-tool.in b/src/cinnamon-extension-tool.in
-index e610b46..8ec24fb 100644
---- a/src/cinnamon-extension-tool.in
-+++ b/src/cinnamon-extension-tool.in
-@@ -148,5 +148,6 @@ use an extension title clicktofocus@janedoe.example.com.'''
-         f.close()
- 
-     print "Created extension in %r" % (extension_path, )
-+    extensionjs_path = os.path.join(extension_path, 'extension.js')
-     subprocess.Popen(['gnome-open', extensionjs_path])
-     sys.exit(0)
--- 
-1.7.8.3
-
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.1.3-xdg-open.patch b/gnome-extra/cinnamon/files/cinnamon-1.1.3-xdg-open.patch
deleted file mode 100644
index f4e355b0d8ee..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-1.1.3-xdg-open.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9db2c12d23daaeab0d69bc8b58cec610689cc4dc Mon Sep 17 00:00:00 2001
-From: "Jasper St. Pierre" <jstpierre@mecheye.net>
-Date: Thu, 20 Oct 2011 12:48:40 -0400
-Subject: [PATCH 04/28] gnome-shell-extension-tool: Use xdg-open
-
-gnome-open is deprecated
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: port to cinnamon]
----
- src/gnome-shell-extension-tool.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/cinnamon-extension-tool.in b/src/cinnamon-extension-tool.in
-index 8ec24fb..2f942d8 100644
---- a/src/cinnamon-extension-tool.in
-+++ b/src/cinnamon-extension-tool.in
-@@ -149,5 +149,5 @@ use an extension title clicktofocus@janedoe.example.com.'''
- 
-     print "Created extension in %r" % (extension_path, )
-     extensionjs_path = os.path.join(extension_path, 'extension.js')
--    subprocess.Popen(['gnome-open', extensionjs_path])
-+    subprocess.Popen(['xdg-open', extensionjs_path])
-     sys.exit(0)
--- 
-1.7.8.3
-
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.2-optional-networkmanager.patch b/gnome-extra/cinnamon/files/cinnamon-1.2-optional-networkmanager.patch
deleted file mode 100644
index 1cee5db513f4..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-1.2-optional-networkmanager.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From 10f58d37fb7b2531bc2239bbc36337d2b3abde45 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 25 Jan 2012 01:58:07 -0500
-Subject: [PATCH] Make NM optional
-
-Derived from a patch for gnome-shell by Michael Biebl <biebl@debian.org>
-(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652482#29)
----
- configure.ac         |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
- js/misc/config.js.in |    2 ++
- js/ui/main.js        |    7 +++++--
- js/ui/panel.js       |    3 ++-
- src/Makefile.am      |   13 ++++++++-----
- 5 files changed, 63 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9e1d63d..a9606a6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -94,8 +94,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
- 			       libcanberra
-                                telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
-                                telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
--                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
--                               libnm-glib libnm-util gnome-keyring-1)
-+                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
-+
-+##########################
-+# Check for NetworkManager
-+##########################
-+NM_MIN_VERSION=0.9
-+AC_ARG_ENABLE(networkmanager,
-+              AS_HELP_STRING([--disable-networkmanager],
-+                             [disable NetworkManager support @<:@default=auto@:>@]),,
-+              [enable_networkmanager=auto])
-+
-+if test "x$enable_networkmanager" != "xno"; then
-+   PKG_CHECK_MODULES(NETWORKMANAGER,
-+                     [libnm-glib libnm-util gnome-keyring-1],
-+                     [have_networkmanager=yes],
-+                     [have_networkmanager=no])
-+
-+   CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS"
-+   CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS"
-+else
-+   have_networkmanager="no  (disabled)"
-+fi
-+
-+if test "x$have_networkmanager" = "xyes"; then
-+   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
-+   AC_SUBST([HAVE_NETWORKMANAGER], [1])
-+else
-+   if test "x$enable_networkmanager" = "xyes"; then
-+      AC_MSG_ERROR([Couldn't find NetworkManager.])
-+   fi
-+   AC_SUBST([HAVE_NETWORKMANAGER], [0])
-+fi
-+
-+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
- 
- PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
- 
-@@ -250,3 +282,15 @@ AC_CONFIG_FILES([
-   files/Makefile
- ])
- AC_OUTPUT
-+
-+echo "
-+Build configuration:
-+
-+	Prefix:                                 ${prefix}
-+	Source code location:                   ${srcdir}
-+	Compiler:                               ${CC}
-+	Compiler Warnings:                      $enable_compile_warnings
-+
-+	Support for NetworkManager:             $have_networkmanager
-+	Support for GStreamer recording:        $build_recorder
-+"
-diff --git a/js/misc/config.js.in b/js/misc/config.js.in
-index 704989b..df7e014 100644
---- a/js/misc/config.js.in
-+++ b/js/misc/config.js.in
-@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
- const GJS_VERSION = '@GJS_VERSION@';
- /* 1 if gnome-bluetooth is available, 0 otherwise */
- const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
-+/* 1 if networkmanager is available, 0 otherwise */
-+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
- /* The system TLS CA list */
- const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@';
-diff --git a/js/ui/main.js b/js/ui/main.js
-index daeb4f7..2be3018 100644
---- a/js/ui/main.js
-+++ b/js/ui/main.js
-@@ -14,6 +14,7 @@ const St = imports.gi.St;
- 
- const AutomountManager = imports.ui.automountManager;
- const AutorunManager = imports.ui.autorunManager;
-+const Config = imports.misc.config;
- const EndSessionDialog = imports.ui.endSessionDialog;
- const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
- const Environment = imports.ui.environment;
-@@ -27,7 +28,7 @@ const PlacesManager = imports.ui.placesManager;
- const RunDialog = imports.ui.runDialog;
- const Layout = imports.ui.layout;
- const LookingGlass = imports.ui.lookingGlass;
--const NetworkAgent = imports.ui.networkAgent;
-+const NetworkAgent = Config.HAVE_NETWORKMANAGER ? imports.ui.networkAgent : null;
- const NotificationDaemon = imports.ui.notificationDaemon;
- const WindowAttentionHandler = imports.ui.windowAttentionHandler;
- const Scripting = imports.ui.scripting;
-@@ -103,7 +104,9 @@ function _createUserSession() {
-     placesManager = new PlacesManager.PlacesManager();    
-     automountManager = new AutomountManager.AutomountManager();
-     autorunManager = new AutorunManager.AutorunManager();
--    networkAgent = new NetworkAgent.NetworkAgent();
-+    if (Config.HAVE_NETWORKMANAGER) {
-+        networkAgent = new NetworkAgent.NetworkAgent();
-+    }
- }
- 
- function _createGDMSession() {
-diff --git a/js/ui/panel.js b/js/ui/panel.js
-index 677d907..25ea0c6 100644
---- a/js/ui/panel.js
-+++ b/js/ui/panel.js
-@@ -44,7 +44,8 @@ if (Config.HAVE_BLUETOOTH)
-     STANDARD_STATUS_AREA_CINNAMON_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
- 
- try {
--    STANDARD_STATUS_AREA_CINNAMON_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
-+    if (Config.HAVE_NETWORKMANAGER)
-+        STANDARD_STATUS_AREA_CINNAMON_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet; 
- } catch(e) {
-     log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
- }
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 182bf17..54770e7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -108,9 +108,7 @@ cinnamon_public_headers_h =		\
- 	cinnamon-generic-container.h	\
- 	cinnamon-gtk-embed.h		\
- 	cinnamon-global.h			\
--	cinnamon-mobile-providers.h	\
- 	cinnamon-mount-operation.h		\
--	cinnamon-network-agent.h		\
- 	cinnamon-perf-log.h		\
- 	cinnamon-slicer.h			\
- 	cinnamon-stack.h			\
-@@ -145,9 +143,7 @@ libcinnamon_la_SOURCES =		\
- 	cinnamon-generic-container.c	\
- 	cinnamon-gtk-embed.c		\
- 	cinnamon-global.c			\
--	cinnamon-mobile-providers.c	\
- 	cinnamon-mount-operation.c		\
--	cinnamon-network-agent.c		\
- 	cinnamon-perf-log.c		\
- 	cinnamon-polkit-authentication-agent.h	\
- 	cinnamon-polkit-authentication-agent.c	\
-@@ -161,6 +157,10 @@ libcinnamon_la_SOURCES =		\
- 	cinnamon-wm.c			\
- 	cinnamon-xfixes-cursor.c
- 
-+if HAVE_NETWORKMANAGER
-+libcinnamon_la_SOURCES += cinnamon-mobile-providers.h cinnamon-mobile-providers.c cinnamon-network-agent.h cinnamon-network-agent.c
-+endif
-+
- libcinnamon_la_gir_sources = \
- 	$(filter-out %-private.h $(cinnamon_recorder_non_gir_sources), $(cinnamon_public_headers_h) $(libcinnamon_la_SOURCES))
- 
-@@ -272,7 +272,10 @@ libcinnamon_la_LIBADD =		\
- libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
- 
- Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
--Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 Folks-0.6
-+Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 Folks-0.6
-+if HAVE_NETWORKMANAGER
-+Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
-+endif
- Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
- Cinnamon_0_1_gir_LIBS = libcinnamon.la
- Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
--- 
-1.7.8.4
-