diff options
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | src/app-section.c | 19 |
3 files changed, 4 insertions, 30 deletions
diff --git a/configure.ac b/configure.ac index e67b66a..ab5829a 100644 --- a/configure.ac +++ b/configure.ac @@ -38,17 +38,12 @@ AC_PROG_CXX # Dependencies ########################### -GTK_REQUIRED_VERSION=3.5.18 GIO_UNIX_REQUIRED_VERSION=2.33.10 -INDICATOR_REQUIRED_VERSION=0.3.19 GLIB_REQUIRED_VERSION=2.35.4 INTROSPECTION_REQUIRED_VERSION=1.32.0 -PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION - glib-2.0 >= $GLIB_REQUIRED_VERSION - gmodule-2.0 >= $GLIB_REQUIRED_VERSION) +PKG_CHECK_MODULES(APPLET, gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION) PKG_CHECK_MODULES(GIO, gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) diff --git a/debian/control b/debian/control index 47d4c0e..164cded 100644 --- a/debian/control +++ b/debian/control @@ -10,14 +10,8 @@ Build-Depends: debhelper (>= 9), gobject-introspection (>= 0.9.12-4~), gtk-doc-tools, intltool, - libdbus-glib-1-dev, - libdbusmenu-glib-dev (>= 0.5.90), - libdbusmenu-gtk3-dev (>= 0.5.90), libgirepository1.0-dev (>= 0.9.12), libgtest-dev, - libgtk-3-dev (>= 3.5.18), - libindicator3-dev, - libtelepathy-glib-dev (>= 0.9.0), python3-dbusmock, valac, Standards-Version: 3.9.3 diff --git a/src/app-section.c b/src/app-section.c index a741172..1a475f4 100644 --- a/src/app-section.c +++ b/src/app-section.c @@ -25,11 +25,10 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include "config.h" #endif -#include <gdk/gdk.h> #include <glib/gi18n.h> #include <gio/gdesktopappinfo.h> #include <gio/gio.h> -#include <libindicator/indicator-desktop-shortcuts.h> +#include "indicator-desktop-shortcuts.h" #include "app-section.h" #include "dbus-data.h" #include "gmenuutils.h" @@ -290,17 +289,6 @@ app_section_finalize (GObject *object) G_OBJECT_CLASS (app_section_parent_class)->dispose (object); } -static GAppLaunchContext * -get_launch_context (guint32 timestamp) -{ - GdkDisplay *display = gdk_display_get_default(); - GdkAppLaunchContext *launch_context = gdk_display_get_app_launch_context (display); - - gdk_app_launch_context_set_timestamp (launch_context, timestamp); - - return G_APP_LAUNCH_CONTEXT (launch_context); -} - /* Respond to one of the shortcuts getting clicked on. */ static void nick_activate_cb (GSimpleAction *action, @@ -526,16 +514,13 @@ activate_cb (GSimpleAction *action, AppSection * mi = APP_SECTION (userdata); AppSectionPrivate * priv = mi->priv; GError *error = NULL; - GAppLaunchContext *launch_context = get_launch_context (g_variant_get_uint32 (param)); - if (!g_app_info_launch (G_APP_INFO (priv->appinfo), NULL, launch_context, &error)) { + if (!g_app_info_launch (G_APP_INFO (priv->appinfo), NULL, NULL, &error)) { g_warning("Unable to execute application for desktop file '%s': %s", g_desktop_app_info_get_filename (priv->appinfo), error->message); g_error_free (error); } - - g_object_unref (launch_context); } static void |