diff options
| -rw-r--r-- | .build.yml | 33 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | src/ui/menu.c | 6 |
4 files changed, 42 insertions, 3 deletions
@@ -22,6 +22,9 @@ requires: - which - yelp-tools - zenity + # mate-desktop dependencies + - iso-codes + - gobject-introspection debian: # Useful URL: https://github.com/mate-desktop/debian-packages @@ -39,6 +42,7 @@ requires: - libgtk-3-dev - libgtop2-dev - libice-dev + - libmate-desktop-dev - libpango1.0-dev - libsm-dev - libstartup-notification0-dev @@ -60,6 +64,10 @@ requires: - x11proto-present-dev - yelp-tools - zenity + # mate-desktop dependencies + - iso-codes + - gobject-introspection + - libgirepository1.0-dev fedora: # Useful URL: https://src.fedoraproject.org/cgit/rpms/marco.git @@ -86,6 +94,9 @@ requires: - startup-notification-devel - yelp-tools - zenity + # mate-desktop dependencies + - iso-codes-devel + - gobject-introspection-devel ubuntu: - autoconf-archive @@ -100,6 +111,7 @@ requires: - libgtk-3-dev - libgtop2-dev - libice-dev + - libmate-desktop-dev - libpango1.0-dev - libsm-dev - libstartup-notification0-dev @@ -121,6 +133,10 @@ requires: - x11proto-present-dev - yelp-tools - zenity + # mate-desktop dependencies + - iso-codes + - gobject-introspection + - libgirepository1.0-dev variables: - 'CHECKERS=" @@ -139,8 +155,25 @@ variables: -enable-checker alpha.unix.cstring.OutOfBounds -enable-checker alpha.core.FixedAddr -enable-checker security.insecureAPI.strcpy"' + - MATE_DESKTOP_VERSION=1.27.1 before_scripts: + - cd ${START_DIR} + - if [ ! -f mate-desktop-${MATE_DESKTOP_VERSION}.tar.xz ];then + - curl -Ls -o mate-desktop-${MATE_DESKTOP_VERSION}.tar.xz https://github.com/mate-desktop/mate-desktop/releases/download/v${MATE_DESKTOP_VERSION}/mate-desktop-${MATE_DESKTOP_VERSION}.tar.xz + - fi + - tar xf mate-desktop-${MATE_DESKTOP_VERSION}.tar.xz + - cd mate-desktop-${MATE_DESKTOP_VERSION} + - if [ ${DISTRO_NAME} == "debian" -o ${DISTRO_NAME} == "ubuntu" ];then + - ./autogen.sh --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --libexecdir=/usr/lib/x86_64-linux-gnu + - else + - ./autogen.sh --prefix=/usr + - fi + - if [ ${TRAVIS} == "false" ]; then + - make clean + - fi + - make + - make install build_scripts: - if [ ${DISTRO_NAME} == "debian" ];then diff --git a/configure.ac b/configure.ac index 3888a643..09cab0f3 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,7 @@ AC_C_BIGENDIAN GIO_MIN_VERSION=2.25.10 GTK_MIN_VERSION=3.22.0 -MARCO_PC_MODULES="gtk+-3.0 >= $GTK_MIN_VERSION gio-2.0 >= $GIO_MIN_VERSION pango >= 1.2.0 libcanberra-gtk3" +MARCO_PC_MODULES="gtk+-3.0 >= $GTK_MIN_VERSION gio-2.0 >= $GIO_MIN_VERSION pango >= 1.2.0 libcanberra-gtk3 mate-desktop-2.0 >= 1.27.1" GLIB_GSETTINGS diff --git a/meson.build b/meson.build index 3bf9b022..c5c61c56 100644 --- a/meson.build +++ b/meson.build @@ -152,6 +152,7 @@ gio_req = '>= 2.25.10' gtk_req = '>= 3.22.0' pango_req = '>= 1.2.0' libcanberra_gtk_req = '>= 3.22.0' +mate_desktop_req = '>= 1.27.1' startup_notification_req = '>= 0.7' xres_req = '>= 1.2.0' @@ -159,6 +160,7 @@ glib_dep = dependency('glib-2.0', version: glib_req) gtk_dep = dependency('gtk+-3.0', version: gtk_req) gio_dep = dependency('gio-2.0', version: gio_req) pango_dep = dependency('pango', version: pango_req) +mate_desktop_dep = dependency('mate-desktop-2.0', version: mate_desktop_req) libcanberra_gtk_dep = dependency('libcanberra-gtk3') xres_dep = dependency('xres', version: xres_req) x11_dep = dependency('x11') @@ -169,6 +171,7 @@ marco_deps = [ gio_dep, pango_dep, libcanberra_gtk_dep, + mate_desktop_dep, xres_dep, ] @@ -178,6 +181,7 @@ marco_message_deps = [ ] marco_window_demo_deps = [ gtk_dep, + mate_desktop_dep, x11_dep, ] diff --git a/src/ui/menu.c b/src/ui/menu.c index 34e4b5d9..54429bf0 100644 --- a/src/ui/menu.c +++ b/src/ui/menu.c @@ -24,6 +24,8 @@ #include <config.h> #include <glib/gi18n-lib.h> +#include <libmate-desktop/mate-image-menu-item.h> + #include <gdk/gdkx.h> #include <stdio.h> #include <string.h> @@ -271,9 +273,9 @@ static GtkWidget* menu_item_new(MenuItem* menuitem, int workspace_id) { GtkWidget* image = gtk_image_new_from_icon_name(menuitem->stock_id, GTK_ICON_SIZE_MENU); - mi = gtk_image_menu_item_new(); + mi = mate_image_menu_item_new(); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), image); + mate_image_menu_item_set_image(MATE_IMAGE_MENU_ITEM(mi), image); gtk_widget_show(image); } else if (menuitem->type == MENU_ITEM_CHECKBOX) |