From 5e3af49718cbfb02f6911e1ca645de5925278a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= Date: Thu, 14 Aug 2014 21:03:43 +0300 Subject: [PATCH] Update for new libpanel-applet version --- configure.ac | 11 +++++------ data/Makefile.am | 2 +- data/menu.xml | 12 ++++++++++-- src/applet.c | 60 ++++++++++++++++++++++++-------------------------------- src/task-title.c | 4 ---- 5 files changed, 42 insertions(+), 47 deletions(-) diff --git a/configure.ac b/configure.ac index 3753921..ca1ce83 100644 --- a/configure.ac +++ b/configure.ac @@ -33,10 +33,11 @@ IT_PROG_INTLTOOL([0.34]) AM_GLIB_GNU_GETTEXT if test "x$GCC" = "xyes"; then - GCC_FLAGS="-g -Wall -Werror" + GCC_FLAGS="-g -Wall -Werror -Wno-error=deprecated-declarations" fi -APPLETDIR=`pkg-config --variable=libpanel_applet_dir libpanelapplet-4.0` +APPLETDIR=`pkg-config --variable=libpanel_applet_dir libpanel-applet` +AC_SUBST(APPLETDIR) GLIB_GSETTINGS @@ -50,17 +51,15 @@ AC_SUBST(GTK_LIBS) PKG_CHECK_MODULES(DESKTOP_GSETTINGS, gsettings-desktop-schemas) AC_SUBST(DESKTOP_GSETTINGS) +LIBPANEL_APPLET_REQUIRED=3.10.0 PKG_CHECK_MODULES(DEPS, - libpanelapplet-4.0 + libpanel-applet >= $LIBPANEL_APPLET_REQUIRED gtk+-3.0 libwnck-3.0 ) AC_SUBST(DEPS_CFLAGS) AC_SUBST(DEPS_LIBS) -#AC_PATH_PROG(GCONFTOOL, gconftool-2) -#AM_GCONF_SOURCE_2 - AC_CONFIG_FILES([ Makefile data/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index a4120ec..19858bc 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,4 @@ -appletdir = $(datadir)/gnome-panel/4.0/applets +appletdir = $(APPLETDIR) applet_in_files = org.gnome.applets.WindowPicker.panel-applet.in applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet) diff --git a/data/menu.xml b/data/menu.xml index bbce6f0..227f5a9 100644 --- a/data/menu.xml +++ b/data/menu.xml @@ -1,2 +1,10 @@ - - +
+ + _Preferences + window-picker-applet.preferences + + + _About + window-picker-applet.about + +
diff --git a/src/applet.c b/src/applet.c index d0a61ff..7538ff6 100644 --- a/src/applet.c +++ b/src/applet.c @@ -41,23 +41,16 @@ WinPickerApp *mainapp; -static void display_about_dialog ( - GtkAction *action, - PanelApplet *applet -); - -static void display_prefs_dialog ( - GtkAction *action, - PanelApplet *applet -); +static void display_about_dialog (GSimpleAction *action, + GVariant *parameter, + gpointer user_data); +static void display_prefs_dialog (GSimpleAction *action, + GVariant *parameter, + gpointer user_data); -static const GtkActionEntry menuActions [] = { - {"Preferences", GTK_STOCK_PREFERENCES, N_("_Preferences"), - NULL, NULL, - G_CALLBACK (display_prefs_dialog) }, - { "About", GTK_STOCK_ABOUT, N_("_About"), - NULL, NULL, - G_CALLBACK (display_about_dialog) } +static const GActionEntry menu_actions[] = { + { "preferences", display_prefs_dialog }, + { "about", display_about_dialog } }; static const gchar *close_window_authors [] = { @@ -93,18 +86,17 @@ static inline void loadAppletStyle (GtkWidget *widget) { } static void setupPanelContextMenu() { - GtkActionGroup* action_group = gtk_action_group_new ("Window Picker Applet Actions"); - gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); - gtk_action_group_add_actions (action_group, - menuActions, - G_N_ELEMENTS (menuActions), - NULL); //NULL because we are not passing any data to the callbacks - char *ui_path = g_build_filename (WINDOW_PICKER_MENU_UI_DIR, "menu.xml", NULL); - panel_applet_setup_menu_from_file( - PANEL_APPLET(mainapp->applet), //mainapp is a global struct - ui_path, - action_group - ); + PanelApplet *applet = PANEL_APPLET (mainapp->applet); + GSimpleActionGroup *action_group = g_simple_action_group_new (); + char *ui_path = g_build_filename (WINDOW_PICKER_MENU_UI_DIR, "menu.xml", NULL); + + g_action_map_add_action_entries (G_ACTION_MAP (action_group), menu_actions, + G_N_ELEMENTS (menu_actions), NULL); + + panel_applet_setup_menu_from_file (applet, ui_path, action_group, GETTEXT_PACKAGE); + gtk_widget_insert_action_group (GTK_WIDGET (applet), "window-picker-applet", + G_ACTION_GROUP (action_group)); + g_free(ui_path); g_object_unref (action_group); } @@ -168,9 +160,9 @@ PANEL_APPLET_OUT_PROCESS_FACTORY ( NULL ); -static void display_about_dialog ( - GtkAction *action, - PanelApplet *applet) +static void display_about_dialog (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) { GtkWidget *panel_about_dialog = gtk_about_dialog_new (); g_object_set (panel_about_dialog, @@ -218,9 +210,9 @@ static GtkWidget* prepareCheckBox(char* text, char* key) { return check; } -static void display_prefs_dialog( - GtkAction *action, - PanelApplet *applet) +static void display_prefs_dialog (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) { //Setup the Preferences window GtkWidget *window, *notebook, *check, *button, *grid; diff --git a/src/task-title.c b/src/task-title.c index 9b0117b..eec8f96 100644 --- a/src/task-title.c +++ b/src/task-title.c @@ -25,12 +25,8 @@ #include #include -#include #include -#include -#include - #include "common.h" #include "task-list.h" -- 2.1.0.rc1