Re: [evolution-patches] Remove deprecated APIs in libedataserver(ui)
- From: Ross Burton <ross burtonini com>
- To: Harish Krishnaswamy <kharish novell com>
- Cc: Evolution Patches <evolution-patches lists ximian com>
- Subject: Re: [evolution-patches] Remove deprecated APIs in libedataserver(ui)
- Date: Tue, 05 Jul 2005 11:20:11 +0100
On Tue, 2005-07-05 at 13:33 +0530, Harish Krishnaswamy wrote:
> Hmm..This breaks the compilation of the evolution-data-server executable
> which was depending on E_DATA_SERVER_CFLAGS.
> Your patch is OK except the change to e_data_server_deps. The rest is
> fine.
Attached is a new patch which adds E_FACTORY_DEPS and _FLAGS to
configure.in, as the factory deps are quite a bit larger than the
library deps now (i.e. gnomevfs, libgnome).
Ross
--
Ross Burton mail: ross burtonini com
jabber: ross burtonini com
www: http://www.burtonini.com./
PGP Fingerprint: 1A21 F5B0 D8D0 CFE3 81D4 E25A 2D09 E447 D0B4 33DF
? depcomp
? gtk-doc.make
? iconv-detect.h
? calendar/config.guess
? calendar/config.sub
? calendar/depcomp
? calendar/install-sh
? calendar/ltmain.sh
? calendar/missing
? calendar/mkinstalldirs
? calendar/ylwrap
? calendar/tests/ecal/test-recur
? camel/camel-mime-tables.c
? libedataserverui/test-contact-store
? libedataserverui/test-name-selector
? servers/exchange/Makefile
? servers/exchange/Makefile.in
? servers/exchange/lib/Makefile
? servers/exchange/lib/Makefile.in
? servers/exchange/storage/Makefile
? servers/exchange/storage/Makefile.in
? servers/exchange/storage/libexchange-storage.pc
? servers/exchange/xntlm/Makefile
? servers/exchange/xntlm/Makefile.in
? src/GNOME_Evolution_DataServer_1.2.server
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/configure.in,v
retrieving revision 1.119
diff -u -r1.119 configure.in
--- configure.in 2 Jul 2005 10:16:17 -0000 1.119
+++ configure.in 5 Jul 2005 10:18:46 -0000
@@ -1081,13 +1081,13 @@
dnl --- libedataserver and libedataserverui flags
-E_DATA_SERVER_DEPS="libxml-2.0 gobject-2.0 >= $GLIB_REQUIRED libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0 gnome-vfs-2.0 $mozilla_nspr"
+E_DATA_SERVER_DEPS="libxml-2.0 gobject-2.0 >= $GLIB_REQUIRED libbonobo-2.0 >= $LIBBONOBO_REQUIRED gconf-2.0 gnome-vfs-2.0 $mozilla_nspr"
EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, $E_DATA_SERVER_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
AC_SUBST(E_DATA_SERVER_CFLAGS)
AC_SUBST(E_DATA_SERVER_LIBS)
-E_DATA_SERVER_UI_DEPS="libxml-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0 gtk+-2.0 libgnomeui-2.0 libglade-2.0"
+E_DATA_SERVER_UI_DEPS="libxml-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0 gtk+-2.0 gconf-2.0 libglade-2.0"
EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, $THREADS_CFLAGS, $THREADS_LIBS)
AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
@@ -1108,6 +1108,14 @@
EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)
AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
AC_SUBST(EVOLUTION_CALENDAR_LIBS)
+
+dnl --- factory flags
+
+E_FACTORY_DEPS="gobject-2.0 >= $GLIB_REQUIRED libbonobo-2.0 >= $LIBBONOBO_REQUIRED gconf-2.0 gnome-vfs-2.0 libgnome-2.0 $mozilla_nspr"
+
+EVO_SET_COMPILE_FLAGS(E_FACTORY, $E_FACTORY_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
+AC_SUBST(E_FACTORY_CFLAGS)
+AC_SUBST(E_FACTORY_LIBS)
dnl --- Groupwise flags
PKG_CHECK_MODULES(SOUPTEMP, libsoup-2.4, have_libsoup_24=yes, have_libsoup_24=no)
Index: calendar/libical/COPYING
===================================================================
RCS file: /cvs/gnome/libical/COPYING,v
retrieving revision 1.6
diff -u -r1.6 COPYING
--- calendar/libical/COPYING 7 Feb 2005 22:14:30 -0000 1.6
+++ calendar/libical/COPYING 5 Jul 2005 10:18:58 -0000
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Index: libedataserver/test-source-list.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/test-source-list.c,v
retrieving revision 1.5
diff -u -r1.5 test-source-list.c
--- libedataserver/test-source-list.c 27 Nov 2003 06:17:02 -0000 1.5
+++ libedataserver/test-source-list.c 5 Jul 2005 10:19:01 -0000
@@ -25,8 +25,6 @@
#endif
#include <glib.h>
-#include <libgnome/gnome-program.h>
-#include <libgnome/gnome-init.h>
#include "e-source-list.h"
/* Globals. */
@@ -56,47 +54,27 @@
static gboolean unset_value = FALSE;
static gboolean unset_color = FALSE;
-static struct poptOption options[] = {
- { "key", '\0', POPT_ARG_STRING, &key_arg, 0,
- "Name of the GConf key to use", "PATH" },
- { "source", '\0', POPT_ARG_STRING, &source_arg, 0,
- "UID of source to apply operation to", "UID" },
- { "group", '\0', POPT_ARG_STRING, &group_arg, 0,
- "UID of group to apply operation to", "UID" },
- { "add-group", '\0', POPT_ARG_STRING, &add_group_arg, 0,
- "Add group of specified name", "NAME" },
- { "add-source", '\0', POPT_ARG_STRING, &add_source_arg, 0,
- "Add source of specified name", "NAME" },
- { "remove-group", '\0', POPT_ARG_STRING, &remove_group_arg, 0,
- "Remove group of specified name", "NAME" },
- { "remove-source", '\0', POPT_ARG_STRING, &remove_source_arg, 0,
- "Remove source of specified name", "NAME" },
- { "property", '\0', POPT_ARG_STRING, &property_arg, 0,
- "Name of source property to apply operation to", "PROPERTY" },
- { "set-name", '\0', POPT_ARG_STRING, &set_name_arg, 0,
- "Set name of source or group. When used with --group, it sets the name of a group. "
- "When used with both --group and --source, it sets the name of a source.", "NAME" },
- { "set-relative-uri", '\0', POPT_ARG_STRING, &set_relative_uri_arg, 0,
- "Set relative URI of a source. Use with --source or --add-source.", "NAME" },
- { "set-base-uri", '\0', POPT_ARG_STRING, &set_base_uri_arg, 0,
- "Set base URI of a group. Use with --group or --add-group.", "NAME" },
- { "set-color", '\0', POPT_ARG_STRING, &set_color_arg, 0,
- "Set the color of a source. Use with --source or --add-source.", "COLOR (rrggbb)" },
- { "unset-color", '\0', POPT_ARG_NONE, &unset_color, 0,
- "Unset the color of a source. Use with --source or --add-source.", NULL },
- { "set-value", '\0', POPT_ARG_STRING, &set_value_arg, 0,
- "Set a property on a source. Use with --source and --property.", NULL },
- { "unset-value", '\0', POPT_ARG_NONE, &unset_value, 0,
- "Unset a property on a source. Use with --source and --property.", NULL },
- { "listen", '\0', POPT_ARG_NONE, &listen, 0,
- "Wait and listen for changes.", "" },
- { "dump", '\0', POPT_ARG_NONE, &dump, 0,
- "List the current configured sources.", "" },
- POPT_AUTOHELP
+static GOptionEntry entries[] = {
+ { "key", '\0', 0, G_OPTION_ARG_STRING, &key_arg, "Name of the GConf key to use", "PATH" },
+ { "source", '\0', 0, G_OPTION_ARG_STRING, &source_arg, "UID of source to apply operations too", "UID"},
+ { "group", '\0', 0, G_OPTION_ARG_STRING, &group_arg, "UID of group to apply operations too", "UID" },
+ { "add-group", '\0', 0, G_OPTION_ARG_STRING, &add_group_arg, "Add group of specified name", "GROUP" },
+ { "add-source", '\0', 0, G_OPTION_ARG_STRING, &add_source_arg, "Add source of specified name", "SOURCE" },
+ { "remove-group", '\0', 0, G_OPTION_ARG_STRING, &remove_group_arg, "Remove group of specified name", "GROUP" },
+ { "remove-source", '\0', 0, G_OPTION_ARG_STRING, &remove_source_arg, "Remove source of specified name", "SOURCE" },
+ { "property", '\0', 0, G_OPTION_ARG_STRING, &property_arg, "Name of source property to apply operation to", "PROPERTY" },
+ { "set-name", '\0', 0, G_OPTION_ARG_STRING, &set_name_arg, "Set name of source or group. When used with --group, it sets the name of a group. When used with both --group and --source, it sets the name of a source.", "NAME" },
+ { "set-relative-uri", '\0', 0, G_OPTION_ARG_STRING, &set_relative_uri_arg, "Set relative URI of a source. Use with --source or --add-source.", "NAME" },
+ { "set-base-uri", '\0', 0, G_OPTION_ARG_STRING, &set_base_uri_arg, "Set base URI of a group. Use with --group or --add-group.", "NAME" },
+ { "set-color", '\0', 0, G_OPTION_ARG_STRING, &set_color_arg, "Set the color of a source. Use with --source or --add-source.", "COLOR (rrggbb)" },
+ { "unset-color", '\0', 0, G_OPTION_ARG_NONE, &unset_color, "Unset the color of a source. Use with --source or --add-source.", NULL },
+ { "set-value", '\0', 0, G_OPTION_ARG_STRING, &set_value_arg, "Set a property on a source. Use with --source and --property.", NULL },
+ { "unset-value", '\0', 0, G_OPTION_ARG_NONE, &unset_value, "Unset a property on a source. Use with --source and --property.", NULL },
+ { "listen", '\0', 0, G_OPTION_ARG_NONE, &listen, "Wait and listen for changes.", NULL },
+ { "dump", '\0', 0, G_OPTION_ARG_NONE, &dump, "List the current configured sources.", NULL },
{ NULL }
};
-
/* Forward decls. */
static void group_added_callback (ESourceList *list, ESourceGroup *group);
static void group_removed_callback (ESourceList *list, ESourceGroup *group);
@@ -562,15 +540,14 @@
int
-main (int argc,
- char **argv)
+main (int argc, char **argv)
{
- GnomeProgram *program;
+ GOptionContext *context;
+ GError *error = NULL;
- program = gnome_program_init ("test-source-list", "0.0",
- LIBGNOME_MODULE, argc, argv,
- GNOME_PARAM_POPT_TABLE, options,
- NULL);
+ context = g_option_context_new ("- test source lists");
+ g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+ g_option_context_parse (context, &argc, &argv, &error);
g_idle_add (on_idle_do_stuff, NULL);
Index: libedataserverui/test-contact-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/test-contact-store.c,v
retrieving revision 1.1
diff -u -r1.1 test-contact-store.c
--- libedataserverui/test-contact-store.c 10 Dec 2004 02:58:08 -0000 1.1
+++ libedataserverui/test-contact-store.c 5 Jul 2005 10:19:01 -0000
@@ -27,7 +27,6 @@
#include "e-contact-store.h"
#include <gtk/gtk.h>
-#include <libgnomeui/gnome-ui-init.h>
static void
entry_changed (GtkWidget *entry, EContactStore *contact_store)
@@ -66,7 +65,6 @@
GtkTreeModel *model_sort;
GtkWidget *scrolled_window;
GtkWidget *window;
- GtkWidget *select_names_entry;
GtkWidget *tree_view;
GtkWidget *box;
GtkWidget *entry;
@@ -120,15 +118,9 @@
int
main (int argc, char **argv)
{
- GnomeProgram *program;
const char *gconf_path;
- program = gnome_program_init ("test-source-selector", "0.0",
- LIBGNOMEUI_MODULE, argc, argv,
- NULL);
-
- if (bonobo_init (&argc, argv) == FALSE)
- g_error ("Could not initialize Bonobo.");
+ gtk_init (&argc, &argv);
if (argc < 2)
gconf_path = "/apps/evolution/addressbook/sources";
@@ -137,7 +129,7 @@
g_idle_add ((GSourceFunc) start_test, (void *) gconf_path);
- bonobo_main ();
+ gtk_main ();
return 0;
}
Index: libedataserverui/test-name-selector.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/test-name-selector.c,v
retrieving revision 1.5
diff -u -r1.5 test-name-selector.c
--- libedataserverui/test-name-selector.c 20 Dec 2004 15:31:29 -0000 1.5
+++ libedataserverui/test-name-selector.c 5 Jul 2005 10:19:01 -0000
@@ -29,8 +29,6 @@
#include "e-name-selector-dialog.h"
#include "e-name-selector-entry.h"
#include <gtk/gtk.h>
-#include <libgnomeui/gnome-ui-init.h>
-#include <bonobo/bonobo-main.h>
#include <camel/camel.h>
static void
@@ -39,7 +37,7 @@
GtkWidget *dialog = data;
gtk_widget_destroy (dialog);
- bonobo_main_quit ();
+ gtk_main_quit ();
}
static gboolean
@@ -79,20 +77,14 @@
int
main (int argc, char **argv)
{
- GnomeProgram *program;
-
- program = gnome_program_init ("test-name-selector", "0.0",
- LIBGNOMEUI_MODULE, argc, argv,
- NULL);
-
- if (bonobo_init (&argc, argv) == FALSE)
- g_error ("Could not initialize Bonobo.");
+ gtk_init (&argc, &argv);
+ g_thread_init (NULL);
camel_init (NULL, 0);
g_idle_add ((GSourceFunc) start_test, NULL);
- bonobo_main ();
+ gtk_main ();
return 0;
}
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/src/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- src/Makefile.am 11 Apr 2005 12:21:33 -0000 1.19
+++ src/Makefile.am 5 Jul 2005 10:19:01 -0000
@@ -16,7 +16,7 @@
-I$(top_builddir)/calendar/libical/src/libical \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
$(SOUP_CFLAGS) \
- $(E_DATA_SERVER_CFLAGS)
+ $(E_FACTORY_CFLAGS)
IDLS = \
@@ -54,7 +54,7 @@
evolution_data_server_LDADD = \
$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \
$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \
- $(E_DATA_SERVER_LIBS)
+ $(E_FACTORY_LIBS)
install-evolution-data-servers:
$(mkinstalldirs) $(DESTDIR)$(libexecdir)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
