From 1c198bd71100c3c0af0aa1d80bb0e1f51918c4f2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 30 Apr 2009 16:28:36 -0400 Subject: =?UTF-8?q?Bug=20580896=20=E2=80=93=20Kill=20libgnome/gnome-progra?= =?UTF-8?q?m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed e-util/e-gui-utils.[ch]. --- addressbook/gui/contact-editor/e-contact-editor.c | 1 - addressbook/gui/widgets/eab-popup-control.c | 1 - 2 files changed, 2 deletions(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index c3a73fbcd5..9eaf9897ba 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -45,7 +45,6 @@ #include "addressbook/printing/e-contact-print.h" #include "addressbook/gui/widgets/eab-gui-util.h" #include "e-util/e-util.h" -#include "e-util/e-gui-utils.h" #include "e-util/e-error.h" #include "misc/e-dateedit.h" #include "misc/e-image-chooser.h" diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c index de3d21b7d6..6a702f3941 100644 --- a/addressbook/gui/widgets/eab-popup-control.c +++ b/addressbook/gui/widgets/eab-popup-control.c @@ -33,7 +33,6 @@ #include #include #include -#include "e-util/e-gui-utils.h" static void eab_popup_control_set_name (EABPopupControl *pop, const gchar *name); static void eab_popup_control_set_email (EABPopupControl *pop, const gchar *email); -- cgit v1.2.3 From 4ce3d9c321888226b2bcbf67e189261d0edb5a53 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 30 Apr 2009 22:03:28 -0400 Subject: =?UTF-8?q?Bug=20580892=20=E2=80=93=20Kill=20libgnomeui/gnome-app?= =?UTF-8?q?=20and=20gnome-app-helper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The only remaining case is widgets/test/test-dropdown-button.c, but this file will be removed when the kill-bonobo branch is merged. --- addressbook/gui/contact-editor/test-editor.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c index 44703c9e57..2f55e4777c 100644 --- a/addressbook/gui/contact-editor/test-editor.c +++ b/addressbook/gui/contact-editor/test-editor.c @@ -24,8 +24,6 @@ #include #include -#include -#include #include #include "e-contact-editor.h" #include "ebook/e-card.h" @@ -97,7 +95,7 @@ int main( int argc, char *argv[] ) char *cardstr; EContactEditor *ce; - gnome_program_init("Contact Editor Test", VERSION, LIBGNOMEUI_MODULE, argc, argv, NULL); + gtk_init (&argc, &argv); glade_init (); -- cgit v1.2.3 From b915f8b5bd5e2da3711f08ac4b18d28bc9e7a21b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 30 Apr 2009 22:21:49 -0400 Subject: More gnome-init cleanup for bug #567283. --- addressbook/gui/widgets/test-reflow.c | 178 ---------------------------------- 1 file changed, 178 deletions(-) delete mode 100644 addressbook/gui/widgets/test-reflow.c (limited to 'addressbook/gui') diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c deleted file mode 100644 index f0faf7899c..0000000000 --- a/addressbook/gui/widgets/test-reflow.c +++ /dev/null @@ -1,178 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* test-reflow.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Chris Lahey - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#define TEST_VCARD \ -"BEGIN:VCARD -" \ -"FN:Nat -" \ -"N:Friedman;Nat;D;Mr. -" \ -"TITLE:Head Geek -" \ -"BDAY:1977-08-06 -" \ -"TEL;WORK:617 679 1984 -" \ -"TEL;CELL:123 456 7890 -" \ -"EMAIL;INTERNET:nat@nat.org -" \ -"EMAIL;INTERNET:nat@ximian.com -" \ -"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234; -" \ -"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA -" \ -"END:VCARD -" \ -" -" - - -#include "config.h" - -#include -#include -#include -#include -#include -#include - -#include "e-minicard.h" - -/* This is a horrible thing to do, but it is just a test. */ -GnomeCanvasItem *reflow; -GnomeCanvasItem *rect; -GtkAllocation last_alloc; - -static void destroy_callback(gpointer data, GObject *where_object_was) -{ - exit(0); -} - -static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data) -{ - double width; - last_alloc = *allocation; - gnome_canvas_item_set( reflow, - "height", (double) allocation->height, - NULL ); - gnome_canvas_item_set( reflow, - "minimum_width", (double) allocation->width, - NULL ); - g_object_get(reflow, - "width", &width, - NULL); - width = MAX(width, allocation->width); - gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, width - 1, allocation->height - 1); - gnome_canvas_item_set( rect, - "x2", (double) width, - "y2", (double) allocation->height, - NULL ); -} - -static void resize(GnomeCanvas *canvas, gpointer data) -{ - double width; - g_object_get(reflow, - "width", &width, - NULL); - width = MAX(width, last_alloc.width); - gnome_canvas_set_scroll_region(canvas , 0, 0, width - 1, last_alloc.height - 1); - gnome_canvas_item_set( rect, - "x2", (double) width, - "y2", (double) last_alloc.height, - NULL ); -} - -int main( int argc, char *argv[] ) -{ - GtkWidget *app; - GtkWidget *canvas; - GtkWidget *vbox; - GtkWidget *scrollframe; - int i; - - /* bindtextdomain (PACKAGE, GNOMELOCALEDIR); - textdomain (PACKAGE);*/ - - gnome_init( "Reflow Test", VERSION, argc, argv); - app = gnome_app_new("Reflow Test", NULL); - - vbox = gtk_vbox_new(FALSE, 0); - - canvas = e_canvas_new(); - rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ), - gnome_canvas_rect_get_type(), - "x1", (double) 0, - "y1", (double) 0, - "x2", (double) 100, - "y2", (double) 100, - "fill_color", "white", - NULL ); - reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ), - e_reflow_get_type(), - "height", (double) 100, - "minimum_width", (double) 100, - NULL ); - g_signal_connect( canvas, "reflow", - G_CALLBACK ( resize ), - ( gpointer ) app); - for ( i = 0; i < 200; i++ ) - { - GnomeCanvasItem *item; - ECard *card = e_card_new (TEST_VCARD); - item = gnome_canvas_item_new( GNOME_CANVAS_GROUP(reflow), - e_minicard_get_type(), - "card", card, - NULL); - e_reflow_add_item(E_REFLOW(reflow), item, NULL); - } - gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ), - 0, 0, - 100, 100 ); - - scrollframe = e_scroll_frame_new (gtk_layout_get_hadjustment(GTK_LAYOUT(canvas)), - gtk_layout_get_vadjustment(GTK_LAYOUT(canvas))); - e_scroll_frame_set_policy (E_SCROLL_FRAME (scrollframe), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_NEVER); - - gtk_container_add (GTK_CONTAINER (scrollframe), canvas); - - gnome_app_set_contents( GNOME_APP( app ), scrollframe ); - - /* Connect the signals */ - g_object_weak_ref (app, destroy_callback, app); - - g_signal_connect( canvas, "size_allocate", - G_CALLBACK ( allocate_callback ), - ( gpointer ) app ); - - gtk_widget_show_all( app ); - gdk_window_set_back_pixmap( GTK_LAYOUT(canvas)->bin_window, NULL, FALSE); - - gtk_main(); - - /* Not reached. */ - return 0; -} -- cgit v1.2.3 From d523f10dfe2a6ba53c068189f10055d46e71e10f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 2 May 2009 11:09:30 -0400 Subject: Use Behdad's brilliant git.mk to generate .gitignore files. --- addressbook/gui/Makefile.am | 2 ++ addressbook/gui/component/Makefile.am | 2 ++ addressbook/gui/contact-editor/Makefile.am | 2 ++ addressbook/gui/contact-list-editor/Makefile.am | 2 ++ addressbook/gui/merging/Makefile.am | 2 ++ addressbook/gui/widgets/Makefile.am | 2 ++ 6 files changed, 12 insertions(+) (limited to 'addressbook/gui') diff --git a/addressbook/gui/Makefile.am b/addressbook/gui/Makefile.am index a737452bd3..64bcd98356 100644 --- a/addressbook/gui/Makefile.am +++ b/addressbook/gui/Makefile.am @@ -1 +1,3 @@ SUBDIRS = merging contact-editor contact-list-editor widgets component + +-include $(top_srcdir)/git.mk diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 5ebdac4eb4..b7870eddc7 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -126,3 +126,5 @@ evolution-addressbook.pure: evolution-addressbook $(PLINK) $(evolution_addressbook_LDFLAGS) $(evolution_addressbook_OBJECTS) $(evolution_addressbook_LDADD) $(LIBS) endif + +-include $(top_srcdir)/git.mk diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index 0b2ec028f5..53ed96fdee 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -40,3 +40,5 @@ glade_DATA = \ fullname.glade EXTRA_DIST= $(glade_DATA) + +-include $(top_srcdir)/git.mk diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index e0605d534a..8e287f3f3a 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -36,3 +36,5 @@ libecontactlisteditor_la_LIBADD = \ glade_DATA = contact-list-editor.glade EXTRA_DIST = $(glade_DATA) + +-include $(top_srcdir)/git.mk diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am index c899d751f4..ebec465d16 100644 --- a/addressbook/gui/merging/Makefile.am +++ b/addressbook/gui/merging/Makefile.am @@ -20,3 +20,5 @@ glade_DATA = eab-contact-duplicate-detected.glade \ EXTRA_DIST = \ $(glade_DATA) + +-include $(top_srcdir)/git.mk diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index e14f274f4e..c3a14d8aeb 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -68,3 +68,5 @@ etspec_DATA= e-addressbook-view.etspec EXTRA_DIST = \ $(etspec_DATA) \ addresstypes.xml + +-include $(top_srcdir)/git.mk -- cgit v1.2.3 From b4d7c0892ef5b329476a6c3689585ca60ca2d8b0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 2 May 2009 23:11:12 -0400 Subject: =?UTF-8?q?Bug=20572977=20=E2=80=93=20Use=20g=5Fstrerror()=20inste?= =?UTF-8?q?ad=20of=20strerror()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addressbook/gui/component/addressbook-migrate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index 09d1a1af9f..f0e106e14c 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -1063,7 +1063,7 @@ migrate_pilot_data (const char *old_path, const char *new_path) n = fsync (fd1); if (n == -1) { - g_warning ("Failed to migrate %s: %s", dent, strerror (errno)); + g_warning ("Failed to migrate %s: %s", dent, g_strerror (errno)); g_unlink (filename); } -- cgit v1.2.3 From fcb97c2bd7c70c711e4ca201eacb871a34a07bf7 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh Date: Mon, 4 May 2009 10:19:42 +0530 Subject: ** BUGFIX: 355240 - String errors Fixes typos specific to: -> addressbook/gui/component/ldap-config.glade.h -> mail/evolution-mail.schemas.in.in.h --- addressbook/gui/component/ldap-config.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade index cc1fbd0174..f87cf84b14 100644 --- a/addressbook/gui/component/ldap-config.glade +++ b/addressbook/gui/component/ldap-config.glade @@ -950,7 +950,7 @@ Using distinguished name (DN) False Search Filter - Search filter is the type of the objects searched for, while performing the search. If this is not modified, by default search will be performed on objectclass of the type "person". + Search filter is the type of object to be searched for. If this is not modified, the default search will be performed on the type "person". -- cgit v1.2.3