summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rwxr-xr-xautogen.sh1
-rw-r--r--gksu/libcaja-gksu.c4
-rw-r--r--open-terminal/caja-open-terminal.c4
-rw-r--r--sendto/caja-sendto-command.c6
-rw-r--r--sendto/docs/Makefile.am2
-rw-r--r--sendto/plugins/caja-burn/caja-burn.c3
-rw-r--r--sendto/plugins/emailclient/emailclient.c2
-rw-r--r--sendto/plugins/gajim/gajim.c3
-rw-r--r--sendto/plugins/pidgin/pidgin.c3
-rw-r--r--sendto/plugins/removable-devices/removable-devices.c3
-rw-r--r--sendto/plugins/upnp/upnp.c2
-rw-r--r--share/shares.c3
13 files changed, 21 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
index 68d738f..a938603 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,4 +72,4 @@ env:
- DISTRO="archlinux:latest"
- DISTRO="debian:testing"
- DISTRO="fedora:latest"
- - DISTRO="ubuntu:devel"
+ - DISTRO="ubuntu:rolling"
diff --git a/autogen.sh b/autogen.sh
index 9a38410..d931315 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,7 +18,6 @@ which mate-autogen || {
}
REQUIRED_AUTOMAKE_VERSION=1.9
-USE_MATE2_MACROS=1
USE_COMMON_DOC_BUILD=yes
. mate-autogen
diff --git a/gksu/libcaja-gksu.c b/gksu/libcaja-gksu.c
index 18c8db1..0e47a14 100644
--- a/gksu/libcaja-gksu.c
+++ b/gksu/libcaja-gksu.c
@@ -10,13 +10,13 @@
#include <libcaja-extension/caja-extension-types.h>
#include <libcaja-extension/caja-menu-provider.h>
-#include "../config.h"
+#include <config.h>
#include <libintl.h>
#define _(x) dgettext (GETTEXT_PACKAGE, x)
#define GKSU_TYPE_CONTEXT_MENU (gksu_context_menu_get_type ())
-#define GKSU_CONTEXT_MENU(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GKSU_TYPE_CONTEXT_MENU))
+
typedef struct {
GObject parent;
diff --git a/open-terminal/caja-open-terminal.c b/open-terminal/caja-open-terminal.c
index b2d18e5..f12ce12 100644
--- a/open-terminal/caja-open-terminal.c
+++ b/open-terminal/caja-open-terminal.c
@@ -91,7 +91,7 @@ get_terminal_file_info (CajaFileInfo *file_info)
return ret;
}
-char *
+static char *
lookup_in_data_dir (const char *basename,
const char *data_dir)
{
@@ -520,7 +520,7 @@ caja_open_terminal_get_background_items (CajaMenuProvider *provider,
}
}
-GList *
+static GList *
caja_open_terminal_get_file_items (CajaMenuProvider *provider,
GtkWidget *window,
GList *files)
diff --git a/sendto/caja-sendto-command.c b/sendto/caja-sendto-command.c
index f1f7397..8ebf81d 100644
--- a/sendto/caja-sendto-command.c
+++ b/sendto/caja-sendto-command.c
@@ -21,7 +21,8 @@
* Author: Roberto Majadas <[email protected]>
*/
-#include "config.h"
+#include <config.h>
+
#include <string.h>
#include <stdlib.h>
#include <glib/gi18n.h>
@@ -34,10 +35,9 @@
#define CAJA_SENDTO_STATUS_LABEL_TIMEOUT_SECONDS 10
#define UNINSTALLED_PLUGINDIR "plugins/removable-devices"
-#define UNINSTALLED_SOURCE "caja-sendto-command.c"
#define SOEXT ("." G_MODULE_SUFFIX)
-#define SOEXT_LEN (strlen (SOEXT))
+
enum {
COLUMN_ICON,
diff --git a/sendto/docs/Makefile.am b/sendto/docs/Makefile.am
index 20f6768..3b293be 100644
--- a/sendto/docs/Makefile.am
+++ b/sendto/docs/Makefile.am
@@ -80,6 +80,8 @@ GTKDOC_LIBS=$(top_builddir)/sendto/libnstplugin.la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
+DISTCLEANFILES = $(DOC_MODULE).actions
+
# Other files to distribute
# e.g. EXTRA_DIST += version.xml.in
EXTRA_DIST += version.xml.in
diff --git a/sendto/plugins/caja-burn/caja-burn.c b/sendto/plugins/caja-burn/caja-burn.c
index 4470dff..91a4f2f 100644
--- a/sendto/plugins/caja-burn/caja-burn.c
+++ b/sendto/plugins/caja-burn/caja-burn.c
@@ -21,7 +21,8 @@
* Author: Jader Henrique da Silva <[email protected]>
*/
-#include "config.h"
+#include <config.h>
+
#include <string.h>
#include <glib/gi18n-lib.h>
#include "nst-common.h"
diff --git a/sendto/plugins/emailclient/emailclient.c b/sendto/plugins/emailclient/emailclient.c
index 189ceb8..6729efd 100644
--- a/sendto/plugins/emailclient/emailclient.c
+++ b/sendto/plugins/emailclient/emailclient.c
@@ -23,7 +23,7 @@
* Stefano Karapetsas <[email protected]>
*/
-#include "config.h"
+#include <config.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/sendto/plugins/gajim/gajim.c b/sendto/plugins/gajim/gajim.c
index cfa97f1..fe22fe1 100644
--- a/sendto/plugins/gajim/gajim.c
+++ b/sendto/plugins/gajim/gajim.c
@@ -22,7 +22,8 @@
*
*/
-#include "config.h"
+#include <config.h>
+
#include <glib/gi18n-lib.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
diff --git a/sendto/plugins/pidgin/pidgin.c b/sendto/plugins/pidgin/pidgin.c
index 2630f41..f18a11f 100644
--- a/sendto/plugins/pidgin/pidgin.c
+++ b/sendto/plugins/pidgin/pidgin.c
@@ -25,7 +25,8 @@
* Author: Roberto Majadas <[email protected]>
*/
-#include "config.h"
+#include <config.h>
+
#include <glib/gi18n-lib.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
diff --git a/sendto/plugins/removable-devices/removable-devices.c b/sendto/plugins/removable-devices/removable-devices.c
index f8f1445..191c2a7 100644
--- a/sendto/plugins/removable-devices/removable-devices.c
+++ b/sendto/plugins/removable-devices/removable-devices.c
@@ -19,7 +19,8 @@
* Bastien Nocera <[email protected]>
*/
-#include "config.h"
+#include <config.h>
+
#include <string.h>
#include <glib/gi18n-lib.h>
#include <gio/gio.h>
diff --git a/sendto/plugins/upnp/upnp.c b/sendto/plugins/upnp/upnp.c
index 4c09e66..cfa25ff 100644
--- a/sendto/plugins/upnp/upnp.c
+++ b/sendto/plugins/upnp/upnp.c
@@ -25,7 +25,7 @@
*
*/
-#include "config.h"
+#include <config.h>
#include <glib/gi18n-lib.h>
#include <libgupnp/gupnp.h>
diff --git a/share/shares.c b/share/shares.c
index 2e39d56..927de49 100644
--- a/share/shares.c
+++ b/share/shares.c
@@ -25,8 +25,7 @@ static time_t refresh_timestamp;
#define KEY_COMMENT "comment"
#define KEY_ACL "usershare_acl"
#define KEY_GUEST_OK "guest_ok"
-#define GROUP_ALLOW_GUESTS "global"
-#define KEY_ALLOW_GUESTS "usershare allow guests"
+
/* Debugging flags */
static gboolean throw_error_on_refresh;