Commit 9a1c1122 authored by Ziirish's avatar Ziirish

Merge remote branch 'origin/trunk' into trunk

Conflicts:
	src/cid-animation.c
parents da823c35 8a901006
......@@ -211,7 +211,8 @@ Makefile POTFILES: stamp-it
stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
$(SHELL) ./config.status
$(SHELL) ./config.status \
&& touch $(subdir)/stamp-it
# Tell versions [3.59,3.63) of GNU make not to export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
......@@ -99,7 +99,7 @@ cid_focus (GtkWidget *pWidget, GdkEventExpose *event, gpointer *userdata)
gboolean bFocusIn = GPOINTER_TO_INT (&userdata[0]);
//cid_info ("CID is currently focused %s.", bFocusIn ? "in" : "out");
// cid_info ("CID is currently focused %s.", bFocusIn ? "in" : "out");
if (cid->config->bShowAbove)
gtk_window_set_keep_below (GTK_WINDOW (cid->pWindow), !bFocusIn);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment