aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2011-07-21 18:28:23 +0200
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2011-07-21 18:28:23 +0200
commit7cd70567cf7c2f1423416513777b85c2efc93c31 (patch)
tree2c9cae13db5759e617ebce46e6278ab6e04050be
parent1a569c2f0cda67071400682be92b01b4c2641ec5 (diff)
downloadayatana-indicator-application-7cd70567cf7c2f1423416513777b85c2efc93c31.tar.gz
ayatana-indicator-application-7cd70567cf7c2f1423416513777b85c2efc93c31.tar.bz2
ayatana-indicator-application-7cd70567cf7c2f1423416513777b85c2efc93c31.zip
Don't use "SecondaryActivate" method
Using XAyatanaSecondaryActivate as libindicator doesn't support the mouse x,y position in secondary_activate signal anymore. This will drop the middle-click support also for KDE status notifier items, but this is needed as we can't control what they would do with this signal (and according to our policies we can't do anything that isn't doable also using a menu item).
-rw-r--r--src/application-service-appstore.c12
-rw-r--r--src/application-service.xml2
-rw-r--r--src/indicator-application.c12
3 files changed, 10 insertions, 16 deletions
diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
index 4353728..09c2a99 100644
--- a/src/application-service-appstore.c
+++ b/src/application-service-appstore.c
@@ -300,18 +300,14 @@ bus_method_call (GDBusConnection * connection, const gchar * sender,
}
} else if (g_strcmp0(method, "ApplicationSecondaryActivateEvent") == 0) {
guint time;
- gint x;
- gint y;
-
- g_variant_get (params, "(&s&suii)", &dbusaddress, &dbusmenuobject,
- &time, &x, &y);
+ g_variant_get (params, "(&s&su)", &dbusaddress, &dbusmenuobject, &time);
app = find_application_by_menu(service, dbusaddress, dbusmenuobject);
if (app != NULL && app->dbus_proxy != NULL) {
- g_dbus_proxy_call(app->dbus_proxy, "SecondaryActivate",
- g_variant_new("(ii)", x, y),
- G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL);
+ g_dbus_proxy_call(app->dbus_proxy, "XAyatanaSecondaryActivate",
+ g_variant_new("(u)", time),
+ G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL);
}
} else {
g_warning("Calling method '%s' on the indicator service and it's unknown", method);
diff --git a/src/application-service.xml b/src/application-service.xml
index cd26d47..434cfd8 100644
--- a/src/application-service.xml
+++ b/src/application-service.xml
@@ -38,8 +38,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
<arg type="s" name="dbusaddress" direction="in" />
<arg type="s" name="dbusobject" direction="in" />
<arg type="u" name="time" direction="in" />
- <arg type="i" name="x" direction="in" />
- <arg type="i" name="y" direction="in" />
</method>
<!-- Signals -->
diff --git a/src/indicator-application.c b/src/indicator-application.c
index 281e397..f94b8b8 100644
--- a/src/indicator-application.c
+++ b/src/indicator-application.c
@@ -110,7 +110,7 @@ static void indicator_application_finalize (GObject *object);
static GList * get_entries (IndicatorObject * io);
static guint get_location (IndicatorObject * io, IndicatorObjectEntry * entry);
static void entry_scrolled (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction);
-static void entry_secondary_activate (IndicatorObject * io, IndicatorObjectEntry * entry, guint time, gint x, gint y, gpointer data);
+static void entry_secondary_activate (IndicatorObject * io, IndicatorObjectEntry * entry, guint time, gpointer data);
void connection_changed (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application);
static void connected (IndicatorApplication * application);
static void disconnected (IndicatorApplication * application);
@@ -407,7 +407,7 @@ get_location (IndicatorObject * io, IndicatorObjectEntry * entry)
/* Redirect the secondary activate to the Application Item */
static void
entry_secondary_activate (IndicatorObject * io, IndicatorObjectEntry * entry,
- guint time, gint x, gint y, gpointer data)
+ guint time, gpointer data)
{
g_return_if_fail(IS_INDICATOR_APPLICATION(io));
@@ -422,10 +422,10 @@ entry_secondary_activate (IndicatorObject * io, IndicatorObjectEntry * entry,
if (app && app->dbusaddress && app->dbusobject && priv->service_proxy) {
g_dbus_proxy_call(priv->service_proxy, "ApplicationSecondaryActivateEvent",
- g_variant_new("(ssuii)", app->dbusaddress,
- app->dbusobject,
- time, x, y),
- G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL);
+ g_variant_new("(ssu)", app->dbusaddress,
+ app->dbusobject,
+ time),
+ G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL);
}
}