Changeset 417c2fc26dedefcc7290adcd925c6b3ef656345f

Timestamp:

03/24/09 19:04:42 (3 years ago)

Author:

Lincoln de Sousa <lincoln@…>

Children:

aca6a9bfe3c55d26345cda97b700f17690ea2ab3

Parents:

8fd387306e4b1be05ca3f43e95e8cb5238d8f0d9

git-committer:

Lincoln de Sousa <lincoln@…> (03/24/09 19:04:42)

Message:

Adding an entry in the preferences menu to prefs windows.

It is important to users that hides trayicon and needs
to configure guake or just want to configure it without
open it.

Files:

• .gitignore (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• data/Makefile.am (modified) (1 diff)
• data/guake-prefs.desktop.in (added)
• m4/intltool.m4 (modified) (4 diffs)
• po/POTFILES.in (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/guake-prefs.in (added)

.gitignore

@@ -24 +24 @@
 guake_globals.py
 guake
+guake-prefs
 autom4te.cache
 POTFILES

configure.ac

@@ -95 +95 @@
     data/Makefile
     data/guake.desktop
+    data/guake-prefs.desktop
     data/org.gnome.Guake.service
     data/pixmaps/Makefile
@@ -102 +103 @@
     src/guake_globals.py
     src/guake
+    src/guake-prefs
 ])
 

data/Makefile.am

@@ -16 +16 @@
 @INTLTOOL_DESKTOP_RULE@
 desktopdir = $(datadir)/applications
-desktop_in_files = guake.desktop.in
+desktop_in_files = guake.desktop.in guake-prefs.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 

m4/intltool.m4

@@ -76 +76 @@
    INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
 
-AC_SUBST(INTLTOOL_DESKTOP_RULE)
-AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-AC_SUBST(INTLTOOL_KEYS_RULE)
-AC_SUBST(INTLTOOL_PROP_RULE)
-AC_SUBST(INTLTOOL_OAF_RULE)
-AC_SUBST(INTLTOOL_PONG_RULE)
-AC_SUBST(INTLTOOL_SERVER_RULE)
-AC_SUBST(INTLTOOL_SHEET_RULE)
-AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
-AC_SUBST(INTLTOOL_UI_RULE)
-AC_SUBST(INTLTOOL_XAM_RULE)
-AC_SUBST(INTLTOOL_KBD_RULE)
-AC_SUBST(INTLTOOL_XML_RULE)
-AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-AC_SUBST(INTLTOOL_CAVES_RULE)
-AC_SUBST(INTLTOOL_SCHEMAS_RULE)
-AC_SUBST(INTLTOOL_THEME_RULE)
-AC_SUBST(INTLTOOL_SERVICE_RULE)
-AC_SUBST(INTLTOOL_POLICY_RULE)
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
+_IT_SUBST(INTLTOOL_KEYS_RULE)
+_IT_SUBST(INTLTOOL_PROP_RULE)
+_IT_SUBST(INTLTOOL_OAF_RULE)
+_IT_SUBST(INTLTOOL_PONG_RULE)
+_IT_SUBST(INTLTOOL_SERVER_RULE)
+_IT_SUBST(INTLTOOL_SHEET_RULE)
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
+_IT_SUBST(INTLTOOL_UI_RULE)
+_IT_SUBST(INTLTOOL_XAM_RULE)
+_IT_SUBST(INTLTOOL_KBD_RULE)
+_IT_SUBST(INTLTOOL_XML_RULE)
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+_IT_SUBST(INTLTOOL_CAVES_RULE)
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
+_IT_SUBST(INTLTOOL_THEME_RULE)
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
+_IT_SUBST(INTLTOOL_POLICY_RULE)
 
 # Check the gettext tools to make sure they are GNU
@@ -111 +111 @@
 fi
 
-AC_PATH_PROG(INTLTOOL_PERL, [perl])
+AC_PATH_PROG(INTLTOOL_PERL, perl)
 if test -z "$INTLTOOL_PERL"; then
-   AC_MSG_ERROR([perl not found; required for intltool])
-fi
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-   AC_MSG_ERROR([perl 5.x required for intltool])
+   AC_MSG_ERROR([perl not found])
+fi
+AC_MSG_CHECKING([for perl >= 5.8.1])
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+else
+   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   AC_MSG_RESULT([$IT_PERL_VERSION])
 fi
 if test "x$2" != "xno-xml"; then
@@ -172 +177 @@
 AC_CONFIG_COMMANDS_PRE([
   AC_CONFIG_COMMANDS([$1/stamp-it], [
-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
+    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
        AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
     fi
@@ -194 +199 @@
 ])
 
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+#
+AC_DEFUN([_IT_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
 # deprecated macros
 AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])

po/POTFILES.in

@@ -4 +4 @@
 data/prefs.glade
 data/guake.desktop.in
+data/guake-prefs.desktop.in
 src/dbusiface.py
 src/guake.py

src/Makefile.am

@@ -2 +2 @@
 
 guakedir = $(bindir)
-bin_SCRIPTS = guake
+bin_SCRIPTS = guake guake-prefs
 
 guakelibdir = $(libdir)/guake