Browse Source

Imported Upstream version 1.7.3

upstream upstream/1.7.3
Nicolas Bourdaud 10 years ago
parent
commit
ae7672c715
  1. 2
      configure.in
  2. 6
      debian/changelog
  3. 162
      mkinstalldirs
  4. 13
      po/Makefile.in.in
  5. 5
      src/compositor/meta-window-actor.c
  6. 2
      src/core/screen.c
  7. 32
      src/ui/frames.c
  8. 6
      src/ui/theme.c

2
configure.in

@ -2,7 +2,7 @@ AC_PREREQ(2.50)
m4_define([muffin_major_version], [1])
m4_define([muffin_minor_version], [7])
m4_define([muffin_micro_version], [2])
m4_define([muffin_micro_version], [3])
m4_define([muffin_version],
[muffin_major_version.muffin_minor_version.muffin_micro_version])

6
debian/changelog

@ -1,3 +1,9 @@
muffin (1.7.3) olivia; urgency=low
* 1.7.3
-- Clement Lefebvre <root@linuxmint.com> Mon, 15 Apr 2013 14:53:18 +0100
muffin (1.7.2) olivia; urgency=low
* 1.7.2

162
mkinstalldirs

@ -1,162 +0,0 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
scriptversion=2009-04-28.21; # UTC
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
# Public domain.
#
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
nl='
'
IFS=" "" $nl"
errstatus=0
dirmode=
usage="\
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
Create each directory DIR (with mode MODE, if specified), including all
leading file name components.
Report bugs to <bug-automake@gnu.org>."
# process command line arguments
while test $# -gt 0 ; do
case $1 in
-h | --help | --h*) # -h for help
echo "$usage"
exit $?
;;
-m) # -m PERM arg
shift
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
dirmode=$1
shift
;;
--version)
echo "$0 $scriptversion"
exit $?
;;
--) # stop option processing
shift
break
;;
-*) # unknown option
echo "$usage" 1>&2
exit 1
;;
*) # first non-opt arg
break
;;
esac
done
for file
do
if test -d "$file"; then
shift
else
break
fi
done
case $# in
0) exit 0 ;;
esac
# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
# mkdir -p a/c at the same time, both will detect that a is missing,
# one will create a, then the other will try to create a and die with
# a "File exists" error. This is a problem when calling mkinstalldirs
# from a parallel make. We use --version in the probe to restrict
# ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
'')
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
else
# On NextStep and OpenStep, the `mkdir' command does not
# recognize any option. It will interpret all options as
# directories to create, and then abort because `.' already
# exists.
test -d ./-p && rmdir ./-p
test -d ./--version && rmdir ./--version
fi
;;
*)
if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
test ! -d ./--version; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
else
# Clean up after NextStep and OpenStep mkdir.
for d in ./-m ./-p ./--version "./$dirmode";
do
test -d $d && rmdir $d
done
fi
;;
esac
for file
do
case $file in
/*) pathcomp=/ ;;
*) pathcomp= ;;
esac
oIFS=$IFS
IFS=/
set fnord $file
shift
IFS=$oIFS
for d
do
test "x$d" = x && continue
pathcomp=$pathcomp$d
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp"
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
errstatus=$lasterr
else
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
lasterr=
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
errstatus=$lasterr
fi
fi
fi
fi
pathcomp=$pathcomp/
done
done
exit $errstatus
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:

13
po/Makefile.in.in

@ -49,8 +49,8 @@ MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
ALL_LINGUAS = @ALL_LINGUAS@
@ -73,15 +73,20 @@ CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$l
.SUFFIXES:
.SUFFIXES: .po .pox .gmo .mo .msg .cat
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@;
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
.po.mo:
$(MSGFMT) -o $@ $<
$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
.po.gmo:
file=`echo $* | sed 's,.*/,,'`.gmo \
$(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) -o $$file $<
.po.cat:

5
src/compositor/meta-window-actor.c

@ -1513,7 +1513,10 @@ meta_window_actor_new (MetaWindow *window)
if (window->type == META_WINDOW_DROPDOWN_MENU ||
window->type == META_WINDOW_POPUP_MENU ||
window->type == META_WINDOW_COMBO){
window->type == META_WINDOW_COMBO ||
window->type == META_WINDOW_NOTIFICATION ||
window->type == META_WINDOW_DND ||
window->type == META_WINDOW_OVERRIDE_OTHER){
clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group),
CLUTTER_ACTOR (self));
}

2
src/core/screen.c

@ -2027,7 +2027,7 @@ meta_screen_tile_preview_hide (MetaScreen *screen)
* Return value: (transfer none): the #MetaWindow pointed by the mouse
* %NULL when window not found
*/
LOCAL_SYMBOL MetaWindow*
MetaWindow*
meta_screen_get_mouse_window (MetaScreen *screen,
MetaWindow *not_this_one)
{

32
src/ui/frames.c

@ -1268,6 +1268,27 @@ meta_frame_right_click_event(MetaUIFrame *frame,
return meta_frame_titlebar_event (frame, event, action);
}
static gboolean
meta_frame_double_click_edge_event (MetaUIFrame *frame,
GdkEventButton *event,
MetaFrameControl control)
{
switch (control) {
case META_FRAME_CONTROL_RESIZE_N:
case META_FRAME_CONTROL_RESIZE_S:
return meta_frame_titlebar_event (frame,
event,
G_DESKTOP_TITLEBAR_ACTION_TOGGLE_MAXIMIZE_VERTICALLY);
case META_FRAME_CONTROL_RESIZE_E:
case META_FRAME_CONTROL_RESIZE_W:
return meta_frame_titlebar_event (frame,
event,
G_DESKTOP_TITLEBAR_ACTION_TOGGLE_MAXIMIZE_HORIZONTALLY);
default:
return FALSE;
}
}
static gboolean
meta_frames_button_press_event (GtkWidget *widget,
GdkEventButton *event)
@ -1319,6 +1340,17 @@ meta_frames_button_press_event (GtkWidget *widget,
return meta_frame_double_click_event (frame, event);
}
if (event->button == 1 &&
event->type == GDK_2BUTTON_PRESS &&
(control == META_FRAME_CONTROL_RESIZE_N ||
control == META_FRAME_CONTROL_RESIZE_S ||
control == META_FRAME_CONTROL_RESIZE_E ||
control == META_FRAME_CONTROL_RESIZE_W))
{
meta_core_end_grab_op (display, event->time);
return meta_frame_double_click_edge_event (frame, event, control);
}
if (meta_core_get_grab_op (display) !=
META_GRAB_OP_NONE)
return FALSE; /* already up to something */

6
src/ui/theme.c

@ -6431,6 +6431,12 @@ meta_gtk_state_to_string (GtkStateFlags state)
return "FOCUSED";
case GTK_STATE_FLAG_BACKDROP:
return "BACKDROP";
#if GTK_MAJOR_VERSION > 3 || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 7)
case GTK_STATE_FLAG_DIR_LTR:
return "DIR_LTR";
case GTK_STATE_FLAG_DIR_RTL:
return "DIR_RTL";
#endif
}
return "<unknown>";

Loading…
Cancel
Save