summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.build.yml38
-rw-r--r--baobab/src/Makefile.am2
-rw-r--r--baobab/src/baobab-utils.c6
-rw-r--r--baobab/src/baobab.c18
-rw-r--r--configure.ac5
-rw-r--r--mate-dictionary/src/Makefile.am6
-rw-r--r--mate-dictionary/src/gdict-sidebar.c4
7 files changed, 68 insertions, 11 deletions
diff --git a/.build.yml b/.build.yml
index 82f2118e..36a3d405 100644
--- a/.build.yml
+++ b/.build.yml
@@ -18,6 +18,10 @@ requires:
- udisks2
- which
- yelp-tools
+ # mate-desktop dependencies
+ - dconf
+ - gobject-introspection
+ - iso-codes
debian:
# Useful URL: https://github.com/mate-desktop/debian-packages
@@ -46,6 +50,11 @@ requires:
- xsltproc
- yelp-tools
- zlib1g-dev
+ # mate-desktop dependencies
+ - gobject-introspection
+ - iso-codes
+ - libdconf-dev
+ - libgirepository1.0-dev
fedora:
# Useful URL: https://src.fedoraproject.org/cgit/rpms/mate-utils.git
@@ -72,6 +81,10 @@ requires:
- redhat-rpm-config
- usermode
- yelp-tools
+ # mate-desktop dependencies
+ - dconf-devel
+ - gobject-introspection-devel
+ - iso-codes-devel
ubuntu:
- autoconf-archive
@@ -82,6 +95,7 @@ requires:
- git
- gtk-doc-tools
- libcanberra-gtk3-dev
+ - libdconf-dev
- libglib2.0-dev
- libgtk-3-dev
- libgtop2-dev
@@ -96,6 +110,11 @@ requires:
- xsltproc
- yelp-tools
- zlib1g-dev
+ # mate-desktop dependencies
+ - gobject-introspection
+ - iso-codes
+ - libdconf-dev
+ - libgirepository1.0-dev
variables:
- 'CHECKERS="
@@ -114,8 +133,27 @@ 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
+
+ - cd ${START_DIR}
# disable pt language for help in search tool
- sed -i s/"IGNORE_HELP_LINGUAS ="/"IGNORE_HELP_LINGUAS = pt"/g gsearchtool/help/Makefile.am
diff --git a/baobab/src/Makefile.am b/baobab/src/Makefile.am
index aa50eaa0..e6e34268 100644
--- a/baobab/src/Makefile.am
+++ b/baobab/src/Makefile.am
@@ -62,6 +62,7 @@ mate_disk_usage_analyzer_CFLAGS = \
$(GIO_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBGTOP_CFLAGS) \
+ $(MATE_DESKTOP_CFLAGS) \
$(WARN_CFLAGS) \
$(NULL)
@@ -72,6 +73,7 @@ mate_disk_usage_analyzer_LDADD = \
$(GIO_LIBS) \
$(GTK_LIBS) \
$(LIBGTOP_LIBS) \
+ $(MATE_DESKTOP_LIBS) \
$(NULL)
CLEANFILES = $(BUILT_SOURCES)
diff --git a/baobab/src/baobab-utils.c b/baobab/src/baobab-utils.c
index d7c03e48..43efd3fb 100644
--- a/baobab/src/baobab-utils.c
+++ b/baobab/src/baobab-utils.c
@@ -33,6 +33,8 @@
#include <glibtop/mountlist.h>
#include <glibtop/fsusage.h>
+#include <libmate-desktop/mate-image-menu-item.h>
+
#include "baobab.h"
#include "baobab-treeview.h"
#include "baobab-utils.h"
@@ -323,9 +325,9 @@ add_popupmenu_item (GtkMenu *pmenu, const gchar *label, const gchar *icon_name,
GtkWidget *item;
GtkWidget *image;
- item = gtk_image_menu_item_new_with_mnemonic (label);
+ item = mate_image_menu_item_new_with_mnemonic (label);
image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+ mate_image_menu_item_set_image (MATE_IMAGE_MENU_ITEM (item), image);
g_signal_connect (item, "activate", item_cb, NULL);
diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c
index 6de2887a..380f5407 100644
--- a/baobab/src/baobab.c
+++ b/baobab/src/baobab.c
@@ -26,6 +26,8 @@
#include <gio/gio.h>
#include <glibtop.h>
+#include <libmate-desktop/mate-image-menu-item.h>
+
#include "baobab.h"
#include "baobab-scan.h"
#include "baobab-treeview.h"
@@ -910,20 +912,20 @@ create_context_menu (void)
menu->widget = gtk_menu_new ();
- menu->up_item = gtk_image_menu_item_new_with_label (_("Move to parent folder"));
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu->up_item),
+ menu->up_item = mate_image_menu_item_new_with_label (_("Move to parent folder"));
+ mate_image_menu_item_set_image (MATE_IMAGE_MENU_ITEM (menu->up_item),
gtk_image_new_from_icon_name("go-up", GTK_ICON_SIZE_MENU));
- menu->zoom_in_item = gtk_image_menu_item_new_with_label (_("Zoom in")) ;
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu->zoom_in_item),
+ menu->zoom_in_item = mate_image_menu_item_new_with_label (_("Zoom in")) ;
+ mate_image_menu_item_set_image (MATE_IMAGE_MENU_ITEM (menu->zoom_in_item),
gtk_image_new_from_icon_name("list-add", GTK_ICON_SIZE_MENU));
- menu->zoom_out_item = gtk_image_menu_item_new_with_label (_("Zoom out"));
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu->zoom_out_item),
+ menu->zoom_out_item = mate_image_menu_item_new_with_label (_("Zoom out"));
+ mate_image_menu_item_set_image (MATE_IMAGE_MENU_ITEM (menu->zoom_out_item),
gtk_image_new_from_icon_name("list-remove", GTK_ICON_SIZE_MENU));
- menu->snapshot_item = gtk_image_menu_item_new_with_label (_("Save screenshot"));
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu->snapshot_item),
+ menu->snapshot_item = mate_image_menu_item_new_with_label (_("Save screenshot"));
+ mate_image_menu_item_set_image (MATE_IMAGE_MENU_ITEM (menu->snapshot_item),
gtk_image_new_from_icon_name ("applets-screenshooter", GTK_ICON_SIZE_MENU));
gtk_menu_shell_append (GTK_MENU_SHELL (menu->widget),
diff --git a/configure.ac b/configure.ac
index d3f65b23..134feaa1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,7 @@ GTK_REQUIRED=3.22.0
LIBMATE_PANEL_APPLET_REQUIRED=1.17.0
LIBGTOP_REQUIRED=2.12.0
LIBCANBERRA_GTK_REQUIRED=0.4
+MATE_DESKTOP_REQUIRED=1.27.1
UDISKS2_REQUIRED=1.90.0
AC_SUBST(GTK_REQUIRED)
@@ -124,6 +125,10 @@ PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
+PKG_CHECK_MODULES(MATE_DESKTOP, mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED)
+AC_SUBST(MATE_DESKTOP_CFLAGS)
+AC_SUBST(MATE_DESKTOP_LIBS)
+
AC_ARG_ENABLE([disk-image-mounter],
[AS_HELP_STRING([--enable-disk-image-mounter=@<:@yes/no@:>@],
[Whether to build the Disk Image Mounter utility])],
diff --git a/mate-dictionary/src/Makefile.am b/mate-dictionary/src/Makefile.am
index fb05c24e..8616b3ef 100644
--- a/mate-dictionary/src/Makefile.am
+++ b/mate-dictionary/src/Makefile.am
@@ -60,6 +60,7 @@ mate_dictionary_CFLAGS = \
$(GLIB_CFLAGS) \
$(GIO_CFLAGS) \
$(GTK_CFLAGS) \
+ $(MATE_DESKTOP_CFLAGS) \
$(WARN_CFLAGS) \
$(NULL)
@@ -69,6 +70,7 @@ mate_dictionary_LDADD = \
$(GLIB_LIBS) \
$(GIO_LIBS) \
$(GTK_LIBS) \
+ $(MATE_DESKTOP_LIBS) \
$(NULL)
if BUILD_GDICT_APPLET
@@ -100,6 +102,7 @@ libmate_dictionary_applet_la_CFLAGS = \
$(GLIB_CFLAGS) \
$(GIO_CFLAGS) \
$(GTK_CFLAGS) \
+ $(MATE_DESKTOP_CFLAGS) \
$(WARN_CFLAGS) \
$(NULL)
@@ -110,6 +113,7 @@ libmate_dictionary_applet_la_LIBADD = \
$(GLIB_LIBS) \
$(GIO_LIBS) \
$(GTK_LIBS) \
+ $(MATE_DESKTOP_LIBS) \
$(NULL)
if ENABLE_WAYLAND
@@ -146,6 +150,7 @@ mate_dictionary_applet_CFLAGS = \
$(GLIB_CFLAGS) \
$(GIO_CFLAGS) \
$(GTK_CFLAGS) \
+ $(MATE_DESKTOP_CFLAGS) \
$(WARN_CFLAGS) \
$(NULL)
@@ -156,6 +161,7 @@ mate_dictionary_applet_LDADD = \
$(GLIB_LIBS) \
$(GIO_LIBS) \
$(GTK_LIBS) \
+ $(MATE_DESKTOP_LIBS) \
$(NULL)
endif # ENABLE_IN_PROCESS
endif # BUILD_GDICT_APPLET
diff --git a/mate-dictionary/src/gdict-sidebar.c b/mate-dictionary/src/gdict-sidebar.c
index 72c56f3f..317f4cbf 100644
--- a/mate-dictionary/src/gdict-sidebar.c
+++ b/mate-dictionary/src/gdict-sidebar.c
@@ -33,6 +33,8 @@
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
+#include <libmate-desktop/mate-image-menu-item.h>
+
#include "gdict-sidebar.h"
typedef struct
@@ -409,7 +411,7 @@ gdict_sidebar_add_page (GdictSidebar *sidebar,
NULL);
/* add the menu item for the page */
- menu_item = gtk_image_menu_item_new_with_label (page_name);
+ menu_item = mate_image_menu_item_new_with_label (page_name);
g_object_set_qdata_full (G_OBJECT (menu_item),
sidebar_page_id_quark,
g_strdup (page_id),
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-25 00:33:46 +0000