diff options
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | gsearchtool/Makefile.am | 2 | ||||
| -rw-r--r-- | logview/data/Makefile.am | 1 | ||||
| -rw-r--r-- | mate-dictionary/data/Makefile.am | 1 | ||||
| -rw-r--r-- | mate-dictionary/src/gdict-applet.c | 2 | ||||
| -rw-r--r-- | mate-dictionary/src/gdict-pref-dialog.c | 2 | ||||
| -rw-r--r-- | mate-dictionary/src/gdict-source-dialog.c | 2 | ||||
| -rw-r--r-- | mate-screenshot/Makefile.am | 2 | ||||
| -rw-r--r-- | mate-screenshot/mate-screenshot.c | 2 |
9 files changed, 8 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 62ed425a..99174089 100644 --- a/configure.ac +++ b/configure.ac @@ -307,14 +307,6 @@ AS_IF([test "x$enable_zlib" != "xno"], AC_SUBST(Z_LIBS) -dnl scrollkeeper checks -AC_PATH_PROG(SCROLLKEEPER_CONFIG, [scrollkeeper-config], [no]) -AS_IF([test x$SCROLLKEEPER_CONFIG = xno], - [ - AC_MSG_ERROR([Couldn't find scrollkeeper-config. Please install the scrollkeeper package]) - ] -) - dnl = Enable strict compiler flags ========================================= # use strict compiler flags only on development releases diff --git a/gsearchtool/Makefile.am b/gsearchtool/Makefile.am index 348c9397..ea8f67c0 100644 --- a/gsearchtool/Makefile.am +++ b/gsearchtool/Makefile.am @@ -58,12 +58,12 @@ Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop) EXTRA_DIST = \ $(Utilities_in_files) \ $(Utilities_DATA) \ + $(convert_DATA) \ $(gsettingsschema_in_files) \ $(man_MANS) CLEANFILES = \ mate-search-tool.desktop \ - $(convert_DATA) \ $(gsettings_SCHEMAS) disthook: diff --git a/logview/data/Makefile.am b/logview/data/Makefile.am index 39ee5dee..a77c9913 100644 --- a/logview/data/Makefile.am +++ b/logview/data/Makefile.am @@ -25,6 +25,7 @@ EXTRA_DIST = \ mate-system-log.desktop.in.in \ $(xml_DATA) \ $(man_MANS) \ + $(convert_DATA) \ $(gsettingsschema_in_files) DISTCLEANFILES = \ diff --git a/mate-dictionary/data/Makefile.am b/mate-dictionary/data/Makefile.am index 5500b65d..51c78991 100644 --- a/mate-dictionary/data/Makefile.am +++ b/mate-dictionary/data/Makefile.am @@ -74,6 +74,7 @@ EXTRA_DIST = \ $(gsettingsschema_in_files) \ $(builder_DATA) \ $(ui_DATA) \ + $(convert_DATA) \ $(NULL) CLEANFILES = \ diff --git a/mate-dictionary/src/gdict-applet.c b/mate-dictionary/src/gdict-applet.c index 9f56f299..ae94b698 100644 --- a/mate-dictionary/src/gdict-applet.c +++ b/mate-dictionary/src/gdict-applet.c @@ -730,7 +730,7 @@ gdict_applet_cmd_help (GtkAction *action, GError *err = NULL; gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)), - "help:mate-dictionary#mate-dictionary-applet", + "help:mate-dictionary/mate-dictionary-applet", gtk_get_current_event_time (), &err); if (err) diff --git a/mate-dictionary/src/gdict-pref-dialog.c b/mate-dictionary/src/gdict-pref-dialog.c index f113194f..1ac35cb3 100644 --- a/mate-dictionary/src/gdict-pref-dialog.c +++ b/mate-dictionary/src/gdict-pref-dialog.c @@ -485,7 +485,7 @@ response_cb (GtkDialog *dialog, { case GTK_RESPONSE_HELP: gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)), - "help:mate-dictionary#mate-dictionary-preferences", + "help:mate-dictionary/mate-dictionary-preferences", gtk_get_current_event_time (), &err); if (err) { diff --git a/mate-dictionary/src/gdict-source-dialog.c b/mate-dictionary/src/gdict-source-dialog.c index 1b7aa0a5..3468011d 100644 --- a/mate-dictionary/src/gdict-source-dialog.c +++ b/mate-dictionary/src/gdict-source-dialog.c @@ -470,7 +470,7 @@ gdict_source_dialog_response_cb (GtkDialog *dialog, break; case GTK_RESPONSE_HELP: gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)), - "help:mate-dictionary#mate-dictionary-add-source", + "help:mate-dictionary/mate-dictionary-add-source", gtk_get_current_event_time (), &err); if (err) { diff --git a/mate-screenshot/Makefile.am b/mate-screenshot/Makefile.am index 842c5d04..c2f9cf44 100644 --- a/mate-screenshot/Makefile.am +++ b/mate-screenshot/Makefile.am @@ -73,12 +73,12 @@ EXTRA_DIST = \ $(mate_screenshot_in_files) \ $(man_MANS) \ $(ui_DATA) \ + $(convert_DATA) \ $(NULL) CLEANFILES = \ $(BUILT_SOURCES) \ $(gsettings_SCHEMAS) \ - $(convert_DATA) \ $(mate_screenshot_DATA) \ $(sys_DATA) diff --git a/mate-screenshot/mate-screenshot.c b/mate-screenshot/mate-screenshot.c index 6510f7f8..cad2c2bd 100644 --- a/mate-screenshot/mate-screenshot.c +++ b/mate-screenshot/mate-screenshot.c @@ -124,7 +124,7 @@ display_help (GtkWindow *parent) GError *error = NULL; gtk_show_uri (gtk_window_get_screen (parent), - "help:user-guide#goseditmainmenu-53", + "help:mate-user-guide/goseditmainmenu-53", gtk_get_current_event_time (), &error); if (error) |