[Xfce4-commits] <thunar:master> Drop exo_gtk_object_ref_sink and exo_gtk_radio_action_set_current_value.
Jannis Pohlmann
jannis at xfce.org
Sun Aug 16 00:40:03 CEST 2009
Updating branch refs/heads/master
to 5ea4696b9d4045f104e382759fc5d20109d29e1d (commit)
from 81b71afb1c188104d809c78ec80a16e7eb686487 (commit)
commit 5ea4696b9d4045f104e382759fc5d20109d29e1d
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Thu Aug 13 15:53:05 2009 +0200
Drop exo_gtk_object_ref_sink and exo_gtk_radio_action_set_current_value.
Use g_object_ref_sink() and gtk_radio_action_set_current_value()
instead.
INSTALL | 107 ++++++++++++++++++-----
plugins/thunar-apr/thunar-apr-desktop-page.c | 2 +-
plugins/thunar-sbr/thunar-sbr-date-renamer.c | 2 +-
plugins/thunar-sbr/thunar-sbr-replace-renamer.c | 2 +-
thunar/thunar-abstract-icon-view.c | 4 +-
thunar/thunar-details-view.c | 6 +-
thunar/thunar-folder.c | 2 +-
thunar/thunar-gtk-extensions.c | 2 +-
thunar/thunar-standard-view.c | 4 +-
thunar/thunar-templates-action.c | 2 +-
thunar/thunar-window.c | 2 +-
11 files changed, 100 insertions(+), 35 deletions(-)
diff --git a/INSTALL b/INSTALL
index d3c5b40..2550dab 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,15 +2,15 @@ Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-This file is free documentation; the Free Software Foundation gives
+ 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
+ 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.
@@ -73,9 +73,9 @@ The simplest way to compile this package is:
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.
+ 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
@@ -88,7 +88,7 @@ is an example:
Compiling For Multiple Architectures
====================================
-You can compile the package for more than one kind of computer at the
+ 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
@@ -100,10 +100,24 @@ 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
+ 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'.
@@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
-Some packages pay attention to `--enable-FEATURE' options to
+ 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
@@ -138,14 +152,46 @@ 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 -D_XOPEN_SOURCE=500"
+
+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"
+
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
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
+ 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:
@@ -153,7 +199,8 @@ type, such as `sun4', or a canonical name which has the form:
where SYSTEM can have one of these forms:
- OS KERNEL-OS
+ 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
@@ -171,9 +218,9 @@ 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'.
+ 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.
@@ -182,7 +229,7 @@ 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
+ 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
@@ -201,11 +248,19 @@ an Autoconf bug. Until the bug is fixed you can use this workaround:
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
- Print a summary of the options to `configure', and exit.
+ 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'
@@ -232,6 +287,16 @@ an Autoconf bug. Until the bug is fixed you can use this workaround:
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/plugins/thunar-apr/thunar-apr-desktop-page.c b/plugins/thunar-apr/thunar-apr-desktop-page.c
index 522b18b..d0d345f 100644
--- a/plugins/thunar-apr/thunar-apr-desktop-page.c
+++ b/plugins/thunar-apr/thunar-apr-desktop-page.c
@@ -140,7 +140,7 @@ thunar_apr_desktop_page_init (ThunarAprDesktopPage *desktop_page)
/* allocate the shared tooltips */
desktop_page->tooltips = gtk_tooltips_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (desktop_page->tooltips));
+ g_object_ref_sink (G_OBJECT (desktop_page->tooltips));
/* allocate shared bold Pango attributes */
attr_list = pango_attr_list_new ();
diff --git a/plugins/thunar-sbr/thunar-sbr-date-renamer.c b/plugins/thunar-sbr/thunar-sbr-date-renamer.c
index ad1c5d4..e976bff 100644
--- a/plugins/thunar-sbr/thunar-sbr-date-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-date-renamer.c
@@ -189,7 +189,7 @@ thunar_sbr_date_renamer_init (ThunarSbrDateRenamer *date_renamer)
/* allocate tooltips for the renamer */
date_renamer->tooltips = gtk_tooltips_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (date_renamer->tooltips));
+ g_object_ref_sink (G_OBJECT (date_renamer->tooltips));
vbox = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (date_renamer), vbox, TRUE, TRUE, 0);
diff --git a/plugins/thunar-sbr/thunar-sbr-replace-renamer.c b/plugins/thunar-sbr/thunar-sbr-replace-renamer.c
index 5b3a595..0f74de0 100644
--- a/plugins/thunar-sbr/thunar-sbr-replace-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-replace-renamer.c
@@ -198,7 +198,7 @@ thunar_sbr_replace_renamer_init (ThunarSbrReplaceRenamer *replace_renamer)
/* allocate the shared tooltips */
replace_renamer->tooltips = gtk_tooltips_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (replace_renamer->tooltips));
+ g_object_ref_sink (G_OBJECT (replace_renamer->tooltips));
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
diff --git a/thunar/thunar-abstract-icon-view.c b/thunar/thunar-abstract-icon-view.c
index 6a396fc..62e96ab 100644
--- a/thunar/thunar-abstract-icon-view.c
+++ b/thunar/thunar-abstract-icon-view.c
@@ -792,11 +792,11 @@ thunar_abstract_icon_view_sort_column_changed (GtkTreeSortable *sortable,
{
/* apply the new sort column */
action = gtk_action_group_get_action (THUNAR_STANDARD_VIEW (abstract_icon_view)->action_group, "sort-by-name");
- exo_gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action), column);
+ gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action), column);
/* apply the new sort order */
action = gtk_action_group_get_action (THUNAR_STANDARD_VIEW (abstract_icon_view)->action_group, "sort-ascending");
- exo_gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action), order);
+ gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action), order);
}
}
diff --git a/thunar/thunar-details-view.c b/thunar/thunar-details-view.c
index 7d56045..b626f42 100644
--- a/thunar/thunar-details-view.c
+++ b/thunar/thunar-details-view.c
@@ -260,18 +260,18 @@ thunar_details_view_init (ThunarDetailsView *details_view)
/* allocate the shared right-aligned text renderer */
right_aligned_renderer = g_object_new (THUNAR_TYPE_TEXT_RENDERER, "xalign", 1.0f, NULL);
- exo_gtk_object_ref_sink (GTK_OBJECT (right_aligned_renderer));
+ g_object_ref_sink (G_OBJECT (right_aligned_renderer));
/* allocate the shared left-aligned text renderer */
left_aligned_renderer = g_object_new (THUNAR_TYPE_TEXT_RENDERER, "xalign", 0.0f, NULL);
- exo_gtk_object_ref_sink (GTK_OBJECT (left_aligned_renderer));
+ g_object_ref_sink (G_OBJECT (left_aligned_renderer));
/* allocate the tree view columns */
for (column = 0; column < THUNAR_N_VISIBLE_COLUMNS; ++column)
{
/* allocate the tree view column */
details_view->columns[column] = gtk_tree_view_column_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (details_view->columns[column]));
+ g_object_ref_sink (G_OBJECT (details_view->columns[column]));
gtk_tree_view_column_set_min_width (details_view->columns[column], 50);
gtk_tree_view_column_set_resizable (details_view->columns[column], TRUE);
gtk_tree_view_column_set_sort_column_id (details_view->columns[column], column);
diff --git a/thunar/thunar-folder.c b/thunar/thunar-folder.c
index 37057ea..4b6b956 100644
--- a/thunar/thunar-folder.c
+++ b/thunar/thunar-folder.c
@@ -606,7 +606,7 @@ thunar_folder_get_for_file (ThunarFile *file)
g_object_ref (G_OBJECT (file));
/* drop the floating reference */
- exo_gtk_object_ref_sink (GTK_OBJECT (folder));
+ g_object_ref_sink (G_OBJECT (folder));
/* connect the folder to the file */
g_object_set_qdata (G_OBJECT (file), thunar_folder_quark, folder);
diff --git a/thunar/thunar-gtk-extensions.c b/thunar/thunar-gtk-extensions.c
index 18e0255..852d837 100644
--- a/thunar/thunar-gtk-extensions.c
+++ b/thunar/thunar-gtk-extensions.c
@@ -197,7 +197,7 @@ thunar_gtk_menu_run (GtkMenu *menu,
_thunar_return_if_fail (GTK_IS_MENU (menu));
/* take over the floating reference on the menu */
- exo_gtk_object_ref_sink (GTK_OBJECT (menu));
+ g_object_ref_sink (G_OBJECT (menu));
/* place the menu on the same screen as the parent */
if (G_UNLIKELY (parent != NULL && GDK_IS_SCREEN (parent)))
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index f908726..0859272 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -626,12 +626,12 @@ thunar_standard_view_init (ThunarStandardView *standard_view)
/* setup the icon renderer */
standard_view->icon_renderer = thunar_icon_renderer_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (standard_view->icon_renderer));
+ g_object_ref_sink (G_OBJECT (standard_view->icon_renderer));
exo_binding_new (G_OBJECT (standard_view), "zoom-level", G_OBJECT (standard_view->icon_renderer), "size");
/* setup the name renderer */
standard_view->name_renderer = thunar_text_renderer_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (standard_view->name_renderer));
+ g_object_ref_sink (G_OBJECT (standard_view->name_renderer));
exo_binding_new (G_OBJECT (standard_view->preferences), "misc-single-click", G_OBJECT (standard_view->name_renderer), "follow-prelit");
/* be sure to update the selection whenever the folder changes */
diff --git a/thunar/thunar-templates-action.c b/thunar/thunar-templates-action.c
index 6dfd9f0..6af367d 100644
--- a/thunar/thunar-templates-action.c
+++ b/thunar/thunar-templates-action.c
@@ -308,7 +308,7 @@ thunar_templates_action_fill_menu (ThunarTemplatesAction *templates_action,
{
/* allocate a new submenu for the directory */
submenu = gtk_menu_new ();
- exo_gtk_object_ref_sink (GTK_OBJECT (submenu));
+ g_object_ref_sink (G_OBJECT (submenu));
gtk_menu_set_screen (GTK_MENU (submenu), gtk_widget_get_screen (menu));
/* fill the submenu from the folder contents */
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index b45c0b6..9367ffe 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -921,7 +921,7 @@ thunar_window_init (ThunarWindow *window)
/* activate the selected view */
action = gtk_action_group_get_action (window->action_group, "view-as-icons");
- exo_gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action), view_type2index (g_type_is_a (type, THUNAR_TYPE_VIEW) ? type : THUNAR_TYPE_ICON_VIEW));
+ gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action), view_type2index (g_type_is_a (type, THUNAR_TYPE_VIEW) ? type : THUNAR_TYPE_ICON_VIEW));
g_signal_connect (G_OBJECT (action), "changed", G_CALLBACK (thunar_window_action_view_changed), window);
thunar_window_action_view_changed (GTK_RADIO_ACTION (action), GTK_RADIO_ACTION (action), window);
More information about the Xfce4-commits
mailing list