Commit 70200031 authored by Vincent Geddes's avatar Vincent Geddes
Browse files

removed the GtkPageSetupUnixDialog and GtkPrintUnixDialog widgets from the

	* plugins/gtk+/gtk+.xml.in: removed the GtkPageSetupUnixDialog and 
	  GtkPrintUnixDialog widgets from the gtk+ catalog. Fixes #392340.

	* plugins/gtk+/gtkunixprint.xml.in: added new, separate catalog for
	  the unix print widgets.

	* plugins/gtk+/Makefile.am: modified the make file to include the new
	  unix print catalog if found by configure.

	* configure.ac: modified configure to check for the existence of
	  the unix print widgets.

	* po/POTFILES.in: added the new unix print catalog to the list of 
	  translatable files.

svn path=/trunk/; revision=1238
parent 279700e4
2007-04-02 Jeff Westerinen <jeff.westerinen@palmsource.com>
* plugins/gtk+/gtk+.xml.in: removed the GtkPageSetupUnixDialog and
GtkPrintUnixDialog widgets from the gtk+ catalog. Fixes #392340.
* plugins/gtk+/gtkunixprint.xml.in: added new, separate catalog for
the unix print widgets.
* plugins/gtk+/Makefile.am: modified the make file to include the new
unix print catalog if found by configure.
* configure.ac: modified configure to check for the existence of
the unix print widgets.
* po/POTFILES.in: added the new unix print catalog to the list of
translatable files.
2007-04-01 Vincent Geddes <vincent.geddes@gmail.com>
* plugins/gtk+/icons/*, plugins/gnome/icons/*: Renamed all icons.
......
......@@ -76,6 +76,13 @@ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0 libxml-2.0 >= 2.4.0])
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS)
dnl ================================================================
dnl Check for the unix print widgets in gtk+
dnl ================================================================
LIBS=$GTK_LIBS
AC_CHECK_FUNCS(gtk_print_unix_dialog_new,[have_unix_print=yes]; break,[have_unix_print=no])
AM_CONDITIONAL(HAVE_GTK_UNIX_PRINT, test x"$have_unix_print" = "xyes")
dnl ================================================================
dnl Check for optional gnome libs
dnl ================================================================
......@@ -281,9 +288,10 @@ echo "
Configuration:
Source code location: ${srcdir}
Compiler: ${CC}
GnomeUI Catalog: ${have_gnome}
Python Binding: ${have_python}
Glade User Manual: ${gdu_cv_have_gdu}
Source code location: ${srcdir}
Compiler: ${CC}
GTK+ UNIX Print Widgets: ${have_unix_print}
GnomeUI Widgets: ${have_gnome}
Python Binding: ${have_python}
Glade User Manual: ${gdu_cv_have_gdu}
"
......@@ -35,10 +35,16 @@ endif
# catalog data
catalogsdir = $(pkgdatadir)/catalogs
catalogs_DATA = gtk+.xml gtk+.xml.in
if HAVE_GTK_UNIX_PRINT
catalogs_DATA += gtkunixprint.xml gtkunixprint.xml.in
endif
@INTLTOOL_XML_NOMERGE_RULE@
CLEANFILES = gtk+.xml
CLEANFILES = gtk+.xml gtkunixprint.xml
EXTRA_DIST = $(catalogs_DATA)
......@@ -1378,9 +1378,6 @@ embedded in another object</_tooltip>
<glade-widget-class name="GtkLinkButton" generic-name="linkbutton" _title="Link Button"/>
<glade-widget-class name="GtkPageSetupUnixDialog" generic-name="pagesetupdialog" _title="Page Setup Dialog"/>
<glade-widget-class name="GtkPrintUnixDialog" generic-name="printdialog" _title="Print Dialog"/>
<glade-widget-class name="GtkRecentChooserWidget" generic-name="recentchooser" _title="Recent Chooser">
<properties>
<property id="size" disabled="True"/>
......@@ -1418,8 +1415,6 @@ embedded in another object</_tooltip>
<glade-widget-class-ref name="GtkFontSelectionDialog"/>
<glade-widget-class-ref name="GtkInputDialog"/>
<glade-widget-class-ref name="GtkMessageDialog"/>
<glade-widget-class-ref name="GtkPageSetupUnixDialog"/>
<glade-widget-class-ref name="GtkPrintUnixDialog"/>
<glade-widget-class-ref name="GtkRecentChooserDialog"/>
<glade-widget-class-ref name="GtkAssistant"/>
</glade-widget-group>
......
<?xml version="1.0" encoding="UTF-8"?>
<glade-catalog name="unixprint" library="gladegtk" icon-prefix="gtk" domain="glade3" depends="gtk+" book="gtk">
<glade-widget-classes>
<glade-widget-class name="GtkPageSetupUnixDialog" generic-name="pagesetupdialog" title="Page Setup Dialog"></glade-widget-class>
<glade-widget-class name="GtkPrintUnixDialog" generic-name="printdialog" title="Print Dialog"></glade-widget-class>
</glade-widget-classes>
<glade-widget-group name="unixprint-toplevels" title="GTK+ Unix Print Toplevels">
<glade-widget-class-ref name="GtkPageSetupUnixDialog"/>
<glade-widget-class-ref name="GtkPrintUnixDialog"/>
</glade-widget-group>
</glade-catalog>
\ No newline at end of file
<glade-catalog name="unixprint"
library="gladegtk"
icon-prefix="gtk"
depends="gtk+"
domain="glade3"
book="gtk">
<glade-widget-classes>
<glade-widget-class name="GtkPageSetupUnixDialog" generic-name="pagesetupdialog" _title="Page Setup Dialog"/>
<glade-widget-class name="GtkPrintUnixDialog" generic-name="printdialog" _title="Print Dialog"/>
</glade-widget-classes>
<glade-widget-group name="unixprint-toplevels" _title="GTK+ Unix Print Toplevels">
<glade-widget-class-ref name="GtkPageSetupUnixDialog"/>
<glade-widget-class-ref name="GtkPrintUnixDialog"/>
</glade-widget-group>
</glade-catalog>
......@@ -40,6 +40,7 @@ gladeui/glade-custom.c
# gtk plugin backend
plugins/gtk+/glade-gtk.c
plugins/gtk+/gtk+.xml.in
plugins/gtk+/gtkunixprint.xml.in
# gnome plugin backend
plugins/gnome/glade-gnome.c
......
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