Merge branch 'XRevan86-master'

This commit is contained in:
Clement Lefebvre 2016-02-10 15:24:38 +00:00
commit 95da1f57da
11 changed files with 13 additions and 26 deletions

View File

@ -321,7 +321,7 @@ dnl ================================================================
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
MATE_COMPILE_WARNINGS(yes) GNOME_COMPILE_WARNINGS(yes)
AC_ARG_ENABLE(deprecations, AC_ARG_ENABLE(deprecations,
[AS_HELP_STRING([--enable-deprecations], [AS_HELP_STRING([--enable-deprecations],
@ -334,7 +334,7 @@ if test "x$enable_deprecations" = "xyes"; then
-DGDK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \
-DMATE_DISABLE_DEPRECATED" -DGNOME_DISABLE_DEPRECATED"
AC_SUBST(DISABLE_DEPRECATED_CFLAGS) AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
fi fi

View File

@ -2113,9 +2113,6 @@ async_free (AsyncData *async)
static void static void
set_busy (XedFileBrowserWidget *obj, gboolean busy) set_busy (XedFileBrowserWidget *obj, gboolean busy)
{ {
#if !GTK_CHECK_VERSION (3, 16, 0)
GdkCursor *cursor;
#endif
GdkWindow *window; GdkWindow *window;
window = gtk_widget_get_window (GTK_WIDGET (obj->priv->treeview)); window = gtk_widget_get_window (GTK_WIDGET (obj->priv->treeview));

View File

@ -10,7 +10,6 @@ AM_CPPFLAGS = \
-I$(srcdir) \ -I$(srcdir) \
-I$(srcdir)/smclient \ -I$(srcdir)/smclient \
$(XED_CFLAGS) \ $(XED_CFLAGS) \
$(MATE_DESKTOP_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
@ -27,8 +26,7 @@ libxed_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]]
libxed_la_LIBADD = \ libxed_la_LIBADD = \
dialogs/libdialogs.la \ dialogs/libdialogs.la \
smclient/libeggsmclient.la \ smclient/libeggsmclient.la
$(MATE_DESKTOP_LIBS)
# XED_LIBS must be the last to ensure correct order on some platforms # XED_LIBS must be the last to ensure correct order on some platforms
libxed_la_LIBADD += $(XED_LIBS) -lICE libxed_la_LIBADD += $(XED_LIBS) -lICE

View File

@ -426,7 +426,7 @@ xed_document_input_stream_read (GInputStream *stream,
do do
{ {
n = read_line (dstream, buffer + read, space_left); n = read_line (dstream, (void *) ((gsize) buffer + read), space_left);
read += n; read += n;
space_left -= n; space_left -= n;
} while (space_left > 0 && n != 0 && dstream->priv->bytes_partial == 0); } while (space_left > 0 && n != 0 && dstream->priv->bytes_partial == 0);
@ -451,7 +451,7 @@ xed_document_input_stream_read (GInputStream *stream,
newline = get_new_line (dstream); newline = get_new_line (dstream);
memcpy (buffer + read, newline, newline_size); memcpy ((void *) ((gsize) buffer + read), newline, newline_size);
read += newline_size; read += newline_size;
dstream->priv->newline_added = TRUE; dstream->priv->newline_added = TRUE;

View File

@ -288,10 +288,6 @@ close_input_stream_ready_cb (GInputStream *stream,
static void static void
write_complete (AsyncData *async) write_complete (AsyncData *async)
{ {
XedDocumentLoader *loader;
loader = XED_DOCUMENT_LOADER (async->loader);
if (async->loader->priv->stream) if (async->loader->priv->stream)
g_input_stream_close_async (G_INPUT_STREAM (async->loader->priv->stream), g_input_stream_close_async (G_INPUT_STREAM (async->loader->priv->stream),
G_PRIORITY_HIGH, G_PRIORITY_HIGH,

View File

@ -516,7 +516,7 @@ DEFINE_INT_PREF (print_line_numbers,
DEFINE_STRING_PREF (print_font_body, DEFINE_STRING_PREF (print_font_body,
GPM_PRINT_FONT_BODY) GPM_PRINT_FONT_BODY)
gchar * static gchar *
xed_prefs_manager_get_default_string_value (const gchar *key) xed_prefs_manager_get_default_string_value (const gchar *key)
{ {
gchar *font = NULL; gchar *font = NULL;

View File

@ -102,10 +102,6 @@ xed_progress_message_area_get_property (GObject *object,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
XedProgressMessageArea *area;
area = XED_PROGRESS_MESSAGE_AREA (object);
switch (prop_id) switch (prop_id)
{ {
default: default:

View File

@ -87,11 +87,11 @@ save_window_session (GKeyFile *state_file,
panel = xed_window_get_side_panel (window); panel = xed_window_get_side_panel (window);
g_key_file_set_boolean (state_file, group_name, "side-panel-visible", g_key_file_set_boolean (state_file, group_name, "side-panel-visible",
gtk_widget_get_visible (panel)); gtk_widget_get_visible (GTK_WIDGET (panel)));
panel = xed_window_get_bottom_panel (window); panel = xed_window_get_bottom_panel (window);
g_key_file_set_boolean (state_file, group_name, "bottom-panel-visible", g_key_file_set_boolean (state_file, group_name, "bottom-panel-visible",
gtk_widget_get_visible (panel)); gtk_widget_get_visible (GTK_WIDGET (panel)));
active_document = xed_window_get_active_document (window); active_document = xed_window_get_active_document (window);
if (active_document) if (active_document)

View File

@ -153,7 +153,7 @@ try_convert (GCharsetConverter *converter,
do do
{ {
res = g_converter_convert (G_CONVERTER (converter), res = g_converter_convert (G_CONVERTER (converter),
inbuf + nread, (void *) ((gsize) inbuf + nread),
inbuf_size - nread, inbuf_size - nread,
out + nwritten, out + nwritten,
out_size - nwritten, out_size - nwritten,

View File

@ -1794,7 +1794,7 @@ start_interactive_search_real (XedView *view)
gtk_widget_get_visible (view->priv->search_window)) gtk_widget_get_visible (view->priv->search_window))
return TRUE; return TRUE;
if (!gtk_widget_has_focus (view)) if (!gtk_widget_has_focus (GTK_WIDGET (view)))
return FALSE; return FALSE;
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));

View File

@ -3398,9 +3398,9 @@ notebook_button_press_event (GtkNotebook *notebook,
} }
else if (GDK_BUTTON_PRESS == event->type && 2 == event->button) else if (GDK_BUTTON_PRESS == event->type && 2 == event->button)
{ {
GtkWidget *tab; XedTab *tab;
tab = GTK_WIDGET (xed_window_get_active_tab (window)); tab = xed_window_get_active_tab (window);
notebook_tab_close_request (notebook, tab, window); notebook_tab_close_request (XED_NOTEBOOK (notebook), tab, GTK_WINDOW (window));
return FALSE; return FALSE;
} }