[Xfce4-commits] <xfbib:master> Coverted to libxfce4ui from libxfcegui4 Removed generated file: INSTALL
Jesper Karlsson
noreply at xfce.org
Mon Feb 18 18:18:01 CET 2013
Updating branch refs/heads/master
to df45402998f50499ff3915feba1d0fdc54d7c1b4 (commit)
from ae3a18363eb6f690db1e3966119bd980e119e3a3 (commit)
commit df45402998f50499ff3915feba1d0fdc54d7c1b4
Author: Jesper Karlsson <zarper at gmail.com>
Date: Sat Dec 15 11:28:05 2012 +0100
Coverted to libxfce4ui from libxfcegui4
Removed generated file: INSTALL
INSTALL | 291 -----------------------------------------
configure.ac.in | 2 +-
src/Makefile.am | 4 +-
src/main.c | 2 +-
src/xfbib-bibtex-field.h | 2 +-
src/xfbib-bibtex-string.c | 2 +-
src/xfbib-entry-edit-dialog.c | 6 +-
src/xfbib-file-io.c | 8 +-
src/xfbib-input-dialog.c | 2 +-
src/xfbib-list-store.c | 2 +-
src/xfbib-menu-bar.c | 10 +-
src/xfbib-string.c | 2 +-
12 files changed, 21 insertions(+), 312 deletions(-)
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 8b82ade..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,291 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
-
- This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
- Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
-
- Running `configure' might take a while. While running, it prints
- some messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
- 6. Often, you can also type `make uninstall' to remove the installed
- files again.
-
-Compilers and Options
-=====================
-
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
- You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
- On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor. Like
-this:
-
- ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CPP="gcc -E" CXXCPP="g++ -E"
-
- This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
- By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Particular systems
-==================
-
- On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
- ./configure CC="cc -Ae"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
- On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file. The option `-nodtk' can be used as
-a workaround. If GNU CC is not installed, it is therefore recommended
-to try
-
- ./configure CC="cc"
-
-and if that doesn't work, try
-
- ./configure CC="cc -nodtk"
-
-Specifying the System Type
-==========================
-
- There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
- Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug. Until the bug is fixed you can use this workaround:
-
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
- `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
- Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
- Print a summary of the options unique to this package's
- `configure', and exit. The `short' variant lists options used
- only in the top level, while the `recursive' variant lists options
- also present in any nested packages.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`--prefix=DIR'
- Use DIR as the installation prefix. *Note Installation Names::
- for more details, including other options available for fine-tuning
- the installation locations.
-
-`--no-create'
-`-n'
- Run the configure checks, but stop before creating any output
- files.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
diff --git a/configure.ac.in b/configure.ac.in
index 5223e1b..f3098ed 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -68,7 +68,7 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.12.0])
XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.12.0])
dnl XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.4.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
dnl check for debugging support
diff --git a/src/Makefile.am b/src/Makefile.am
index 108dac1..b2778e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,7 +51,7 @@ xfbib_SOURCES = \
xfbib_CFLAGS = \
$(GTK_CFLAGS) \
$(GLIB_CFLAGS) \
- $(LIBXFCEGUI4_CFLAGS) \
+ $(LIBXFCE4UI_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
-DDATADIR=\"$(datadir)\" \
-DSRCDIR=\"$(top_srcdir)\" \
@@ -60,5 +60,5 @@ xfbib_CFLAGS = \
xfbib_LDADD = \
$(GTK_LIBS) \
$(GLIB_LIBS) \
- $(LIBXFCEGUI4_LIBS) \
+ $(LIBXFCE4UI_LIBS) \
$(LIBXFCE4UTIL_LIBS)
diff --git a/src/main.c b/src/main.c
index 73de328..58e2109 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include "xfbib-bibtex.h"
#include "xfbib-state.h"
diff --git a/src/xfbib-bibtex-field.h b/src/xfbib-bibtex-field.h
index 6422c1c..64138d0 100644
--- a/src/xfbib-bibtex-field.h
+++ b/src/xfbib-bibtex-field.h
@@ -21,7 +21,7 @@
#define __XFBIB_BIBTEX_FIELD_H
#include <glib-object.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include "xfbib-bibtex-value.h"
#define XFBIB_TYPE_BIBTEX_FIELD (xfbib_bibtex_field_get_type())
diff --git a/src/xfbib-bibtex-string.c b/src/xfbib-bibtex-string.c
index 360d002..27307f1 100644
--- a/src/xfbib-bibtex-string.c
+++ b/src/xfbib-bibtex-string.c
@@ -22,7 +22,7 @@
#endif
#include <gtk/gtk.h>
#include <string.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include "xfbib-bibtex-string.h"
#include "xfbib-bibtex-value.h"
diff --git a/src/xfbib-entry-edit-dialog.c b/src/xfbib-entry-edit-dialog.c
index ba893a5..8c9fb34 100644
--- a/src/xfbib-entry-edit-dialog.c
+++ b/src/xfbib-entry-edit-dialog.c
@@ -21,7 +21,7 @@
#include <config.h>
#endif
#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include <string.h>
#include <glib.h>
@@ -510,11 +510,11 @@ gboolean
xfbib_entry_edit_dialog_valid_entry(XfbibEntryEditDialog *entry_edit_dialog)
{
if(gtk_combo_box_get_active(GTK_COMBO_BOX(entry_edit_dialog->type_combo_box)) == -1) {
- xfce_warn(_("A BibTeX type is required!"));
+ xfce_dialog_show_warning(NULL, NULL, _("A BibTeX type is required!"));
return FALSE;
}
if(strcmp(gtk_entry_get_text(GTK_ENTRY(entry_edit_dialog->key_entry)), "") == 0) {
- xfce_warn(_("BibTeX key is required!"));
+ xfce_dialog_show_warning(NULL, NULL, _("BibTeX key is required!"));
return FALSE;
}
diff --git a/src/xfbib-file-io.c b/src/xfbib-file-io.c
index c6fd865..53676db 100644
--- a/src/xfbib-file-io.c
+++ b/src/xfbib-file-io.c
@@ -24,7 +24,7 @@
#include <errno.h>
#include <string.h>
#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include <stdlib.h>
#include "xfbib-file-io.h"
@@ -96,7 +96,7 @@ xfbib_file_io_open(gchar *filename)
if (!g_file_get_contents(name, &contents, &length, &err)) {
- xfce_err(_("An error occurred when opening the file: %s\n"), err->message);
+ xfce_dialog_show_error(NULL, NULL, _("An error occurred when opening the file: %s\n"), err->message);
g_error_free(err);
return NULL;
} else {
@@ -139,12 +139,12 @@ xfbib_file_io_save(gchar *name)
xfbib_bibtex_foreach(elements, foreach_bibtex_element, str);
if ((fd = fopen(name, "w")) == NULL) {
- xfce_err(_("An error occurred when opening the file: %s\n"), strerror(errno));
+ xfce_dialog_show_error(NULL, NULL, _("An error occurred when opening the file: %s\n"), strerror(errno));
return FALSE;
}
if(fputs(str->str, fd) == EOF) {
- xfce_err(_("An error occurred when writing to the file: %s\n"), name);
+ xfce_dialog_show_error(NULL, NULL, _("An error occurred when writing to the file: %s\n"), name);
return FALSE;
}
diff --git a/src/xfbib-input-dialog.c b/src/xfbib-input-dialog.c
index e1ad493..5413a2a 100644
--- a/src/xfbib-input-dialog.c
+++ b/src/xfbib-input-dialog.c
@@ -21,7 +21,7 @@
#include <config.h>
#endif
#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include "xfbib-input-dialog.h"
diff --git a/src/xfbib-list-store.c b/src/xfbib-list-store.c
index 3101b3d..1d428c9 100644
--- a/src/xfbib-list-store.c
+++ b/src/xfbib-list-store.c
@@ -22,7 +22,7 @@
#endif
#include <string.h>
#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include "xfbib-list-store.h"
#include "xfbib-state.h"
diff --git a/src/xfbib-menu-bar.c b/src/xfbib-menu-bar.c
index 4f13545..49402d3 100644
--- a/src/xfbib-menu-bar.c
+++ b/src/xfbib-menu-bar.c
@@ -22,7 +22,7 @@
#endif
#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include <stdio.h>
#include "xfbib-entry-edit-dialog.h"
@@ -145,7 +145,7 @@ cb_entry_remove_activate (GtkMenuItem *menuitem, gpointer user_data)
if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
xfbib_list_store_remove(XFBIB_LIST_STORE(model), &iter);
} else {
- xfce_err(_("No row has been selected for removal"));
+ xfce_dialog_show_error(NULL, NULL, _("No row has been selected for removal"));
}
}
@@ -180,7 +180,7 @@ cb_entry_edit_activate (GtkMenuItem *menuitem, gpointer user_data)
}
gtk_widget_destroy(dialog);
} else {
- xfce_err(_("No row has been selected for edit"));
+ xfce_dialog_show_error(NULL, NULL, _("No row has been selected for edit"));
}
}
@@ -224,7 +224,7 @@ cb_variable_remove_activate (GtkMenuItem *menuitem, gpointer user_data)
if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
xfbib_list_store_remove(XFBIB_LIST_STORE(model), &iter);
} else {
- xfce_err(_("No row has been selected for removal"));
+ xfce_dialog_show_error(NULL, NULL, _("No row has been selected for removal"));
}
}
@@ -275,7 +275,7 @@ cb_help_about_activate (GtkMenuItem *menuitem, gpointer ignored)
gtk_show_about_dialog(GTK_WINDOW(window),
"authors", xfbib_authors,
"comments", _("Xfbib is a BibTeX editor for the Xfce Desktop Environment."),
- "copyright", XFCE_COPYRIGHT_TEXT("2008", "Jesper Karlsson & David Gustafsson"),
+ "copyright", "Copyright \302\251 2008 Jesper Karlsson & David Gustafsson",
"license", XFCE_LICENSE_GPL,
"logo-icon-name", PACKAGE,
#if GTK_CHECK_VERSION(2,12,0)
diff --git a/src/xfbib-string.c b/src/xfbib-string.c
index 08d934a..3794a70 100644
--- a/src/xfbib-string.c
+++ b/src/xfbib-string.c
@@ -23,7 +23,7 @@
#include <string.h>
#include <gtk/gtk.h>
#include <stdlib.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include "xfbib-string.h"
More information about the Xfce4-commits
mailing list