[SCM] guayadeque/master: Remove 04-mmkeys.patch, applied upstream.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d60a813731b405806b465c068b8c26c5e32fee79
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Feb 11 16:12:00 2012 +0100

    Remove 04-mmkeys.patch, applied upstream.

diff --git a/debian/patches/04-mmkeys.patch b/debian/patches/04-mmkeys.patch
deleted file mode 100644
index 73a91cb..0000000
--- a/debian/patches/04-mmkeys.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Description: Make multimedia keys work with GNOME 3.
-Origin: upstream, commit:r1660
-Bug-Ubuntu: https://launchpad.net/bugs/860600
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655561
----
- src/dbus/mmkeys.cpp |   53 +++++++++++++++++++++++++++++++++++++++++++++++++---
- src/dbus/mmkeys.h   |    7 ++++--
- 2 files changed, 55 insertions(+), 5 deletions(-)
-
---- guayadeque.orig/src/dbus/mmkeys.cpp
-+++ guayadeque/src/dbus/mmkeys.cpp
-@@ -31,13 +31,55 @@ guMMKeys::guMMKeys( guDBusServer * serve
-     RegisterClient();
- 
-     // Support for the MultimediaKeys
--    AddMatch( "type='signal',interface='org.gnome.SettingsDaemon'" );
-+//    AddMatch( "type='signal',interface='org.gnome.SettingsDaemon'" );
-     AddMatch( "type='signal',interface='org.gnome.SettingsDaemon.MediaKeys'" );
-+
-+    GrabMediaPlayerKeys( 0 );
- }
- 
- // -------------------------------------------------------------------------------- //
- guMMKeys::~guMMKeys()
- {
-+    ReleaseMediaPlayerKeys();
-+}
-+
-+// -------------------------------------------------------------------------------- //
-+void guMMKeys::GrabMediaPlayerKeys( const unsigned int time )
-+{
-+    guDBusMethodCall * Msg = new guDBusMethodCall( "org.gnome.SettingsDaemon",
-+            "/org/gnome/SettingsDaemon/MediaKeys",
-+			"org.gnome.SettingsDaemon.MediaKeys",
-+			"GrabMediaPlayerKeys" );
-+
-+    const char * AppId = "Guayadeque";
-+
-+    dbus_message_append_args( Msg->GetMessage(),
-+                              DBUS_TYPE_STRING, &AppId,
-+                              DBUS_TYPE_UINT32, &time,
-+                              DBUS_TYPE_INVALID );
-+
-+    SendWithReply( Msg );
-+
-+    delete Msg;
-+}
-+
-+// -------------------------------------------------------------------------------- //
-+void guMMKeys::ReleaseMediaPlayerKeys( void )
-+{
-+    guDBusMethodCall * Msg = new guDBusMethodCall( "org.gnome.SettingsDaemon",
-+            "/org/gnome/SettingsDaemon/MediaKeys",
-+			"org.gnome.SettingsDaemon.MediaKeys",
-+			"ReleaseMediaPlayerKeys" );
-+
-+    const char * AppId = "Guayadeque";
-+
-+    dbus_message_append_args( Msg->GetMessage(),
-+                              DBUS_TYPE_STRING, &AppId,
-+                              DBUS_TYPE_INVALID );
-+
-+    SendWithReply( Msg );
-+
-+    delete Msg;
- }
- 
- // -------------------------------------------------------------------------------- //
-@@ -54,8 +96,13 @@ DBusHandlerResult guMMKeys::HandleMessag
-     // MULTIMEDIA KEYS
-     if( Type == DBUS_MESSAGE_TYPE_SIGNAL )  // If its a Signal message
-     {
--        if( !strcmp( Path, "/org/gnome/SettingsDaemon" ) ||
--            !strcmp( Path, "/org/gnome/SettingsDaemon/MediaKeys" ) )
-+        //guLogMessage( wxT( "**** Received Signal ****\n" )
-+        //              wxT( "Path   : '%s'\n" )
-+        //              wxT( "Member : '%s'" ),
-+        //             wxString( Path, wxConvUTF8 ).c_str(),
-+        //             wxString( Member, wxConvUTF8 ).c_str()
-+        //            );
-+        if( !strcmp( Path, "/org/gnome/SettingsDaemon/MediaKeys" ) )
-         {
-             if( !strcmp( Member, "MediaPlayerKeyPressed" ) )
-             {
---- guayadeque.orig/src/dbus/mmkeys.h
-+++ guayadeque/src/dbus/mmkeys.h
-@@ -28,13 +28,16 @@
- class guMMKeys : public guDBusClient
- {
-   protected :
--    guPlayerPanel * m_PlayerPanel;
-+    guPlayerPanel *                 m_PlayerPanel;
- 
-   public :
-     guMMKeys( guDBusServer * server, guPlayerPanel * playerpanel );
-     ~guMMKeys();
- 
--    virtual DBusHandlerResult   HandleMessages( guDBusMessage * msg, guDBusMessage * reply = NULL );
-+    virtual DBusHandlerResult       HandleMessages( guDBusMessage * msg, guDBusMessage * reply = NULL );
-+
-+    void                            GrabMediaPlayerKeys( const unsigned int time );
-+    void                            ReleaseMediaPlayerKeys( void );
- 
- };
- 
diff --git a/debian/patches/series b/debian/patches/series
index b39326a..907c2f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01-desktop_file.patch
 02-wxsqlite3_linking.patch
 03-curl_headers_location.patch
-04-mmkeys.patch

-- 
guayadeque packaging