mirror of
https://github.com/brl/mutter.git
synced 2024-11-09 07:26:51 -05:00
require GTK+ 2.2.0
2003-02-13 Havoc Pennington <hp@redhat.com> * configure.in: require GTK+ 2.2.0 * src/ui.c (meta_ui_init): remove hackaround for Pango X core fonts backend
This commit is contained in:
parent
ed25155fc1
commit
02a491c1bc
@ -1,3 +1,10 @@
|
|||||||
|
2003-02-13 Havoc Pennington <hp@redhat.com>
|
||||||
|
|
||||||
|
* configure.in: require GTK+ 2.2.0
|
||||||
|
|
||||||
|
* src/ui.c (meta_ui_init): remove hackaround for Pango X core
|
||||||
|
fonts backend
|
||||||
|
|
||||||
2003-02-05 Abel Cheung <maddog@linux.org.hk>
|
2003-02-05 Abel Cheung <maddog@linux.org.hk>
|
||||||
|
|
||||||
* configure.in: Added "en_GB" and "nl" to ALL_LINGUAS.
|
* configure.in: Added "en_GB" and "nl" to ALL_LINGUAS.
|
||||||
|
22
configure.in
22
configure.in
@ -83,7 +83,7 @@ if test "x$GCC" = "xyes"; then
|
|||||||
fi
|
fi
|
||||||
changequote([,])dnl
|
changequote([,])dnl
|
||||||
|
|
||||||
METACITY_PC_MODULES='gtk+-2.0 >= 2.0.0'
|
METACITY_PC_MODULES='gtk+-2.0 >= 2.2.0 pango >= 1.2.0'
|
||||||
|
|
||||||
AC_ARG_ENABLE(config-dialog, [ --enable-config-dialog enable the config dialog that you need with GNOME 2.0 (obsolete with GNOME 2.2)],,enable_config_dialog=no)
|
AC_ARG_ENABLE(config-dialog, [ --enable-config-dialog enable the config dialog that you need with GNOME 2.0 (obsolete with GNOME 2.2)],,enable_config_dialog=no)
|
||||||
|
|
||||||
@ -120,11 +120,17 @@ ALL_LINGUAS="am az bg ca cs da de el en_GB es fi fr gl he hu it ja ko lv mk mn m
|
|||||||
AM_GLIB_GNU_GETTEXT
|
AM_GLIB_GNU_GETTEXT
|
||||||
|
|
||||||
## here we get the flags we'll actually use
|
## here we get the flags we'll actually use
|
||||||
PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-2.0 >= 2.0.0)
|
PKG_CHECK_MODULES(METACITY_MESSAGE, gtk+-2.0 >= 2.2.0)
|
||||||
PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-2.0 >= 2.0.0)
|
PKG_CHECK_MODULES(METACITY_WINDOW_DEMO, gtk+-2.0 >= 2.2.0)
|
||||||
|
|
||||||
if test x$enable_config_dialog = xyes; then
|
if test x$enable_config_dialog = xyes; then
|
||||||
PKG_CHECK_MODULES(METACITY_PROPS, gtk+-2.0 >= 2.0.0 gconf-2.0 >= 1.1.9 libglade-2.0)
|
PKG_CHECK_MODULES(METACITY_PROPS, gtk+-2.0 >= 2.2.0 gconf-2.0 >= 1.1.9 libglade-2.0)
|
||||||
|
fi
|
||||||
|
|
||||||
|
if $PKG_CONFIG --atleast-version 1.2.0 pangoxft; then
|
||||||
|
echo "pangoxft found"
|
||||||
|
else
|
||||||
|
AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
STARTUP_NOTIFICATION_VERSION=0.4
|
STARTUP_NOTIFICATION_VERSION=0.4
|
||||||
@ -155,13 +161,6 @@ fi
|
|||||||
|
|
||||||
PKG_CHECK_MODULES(METACITY, $METACITY_PC_MODULES)
|
PKG_CHECK_MODULES(METACITY, $METACITY_PC_MODULES)
|
||||||
|
|
||||||
if $PKG_CONFIG --atleast-version 2.2.0 gtk+-2.0; then
|
|
||||||
AC_DEFINE(HAVE_GTK_MULTIHEAD,,[gtk+ with multihead support found])
|
|
||||||
with_multihead=yes
|
|
||||||
else
|
|
||||||
with_multihead=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_PATH_XTRA
|
AC_PATH_XTRA
|
||||||
|
|
||||||
ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
|
ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
|
||||||
@ -384,7 +383,6 @@ metacity-$VERSION:
|
|||||||
GConf: ${enable_gconf}
|
GConf: ${enable_gconf}
|
||||||
XFree86 Xinerama: ${use_xfree_xinerama}
|
XFree86 Xinerama: ${use_xfree_xinerama}
|
||||||
Solaris Xinerama: ${use_solaris_xinerama}
|
Solaris Xinerama: ${use_solaris_xinerama}
|
||||||
Multihead: ${with_multihead}
|
|
||||||
Startup notification: ${have_startup_notification}
|
Startup notification: ${have_startup_notification}
|
||||||
Session management: ${found_sm}
|
Session management: ${found_sm}
|
||||||
Shape extension: ${found_shape}
|
Shape extension: ${found_shape}
|
||||||
|
22
src/ui.c
22
src/ui.c
@ -51,28 +51,6 @@ meta_ui_init (int *argc, char ***argv)
|
|||||||
if (!gtk_init_check (argc, argv))
|
if (!gtk_init_check (argc, argv))
|
||||||
meta_fatal ("Unable to open X display %s\n", XDisplayName (NULL));
|
meta_fatal ("Unable to open X display %s\n", XDisplayName (NULL));
|
||||||
|
|
||||||
{
|
|
||||||
/* FIXME hackaround for Pango opening a separate display
|
|
||||||
* connection and doing a server grab while we have a grab
|
|
||||||
* on the primary display connection. This forces Pango to
|
|
||||||
* go ahead and do its font cache before we try to grab
|
|
||||||
* the server.
|
|
||||||
*/
|
|
||||||
PangoFontMetrics *metrics;
|
|
||||||
PangoLanguage *lang;
|
|
||||||
PangoContext *context;
|
|
||||||
PangoFontDescription *font_desc;
|
|
||||||
|
|
||||||
context = gdk_pango_context_get ();
|
|
||||||
lang = gtk_get_default_language ();
|
|
||||||
font_desc = pango_font_description_from_string ("Sans 12");
|
|
||||||
metrics = pango_context_get_metrics (context, font_desc, lang);
|
|
||||||
|
|
||||||
pango_font_metrics_unref (metrics);
|
|
||||||
pango_font_description_free (font_desc);
|
|
||||||
g_object_unref (G_OBJECT (context));
|
|
||||||
}
|
|
||||||
|
|
||||||
meta_stock_icons_init ();
|
meta_stock_icons_init ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user