From 77bfb99eac375387bb5c851998e7006d4c440f0f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 31 Jul 2008 11:29:15 +0000 Subject: ** Fixes bug #545568 2008-07-31 Matthew Barnes ** Fixes bug #545568 * e-plugin.c (ep_load): Make sure system plugins are enabled on startup. * plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml: * plugins/caldav/org-gnome-caldav.eplug.xml: * plugins/calendar-file/org-gnome-calendar-file.eplug.xml: * plugins/calendar-http/org-gnome-calendar-http.eplug.xml: * plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml: * plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml: * plugins/google-account-setup/org-gnome-evolution-google.eplug.xml: * plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml: * plugins/hula-account-setup/org-gnome-hula-account-setup.eplug.xml: Add "system_plugin=true" so it's not shown in the Plugin Manager. These plugins are not designed to be disabled by the user. svn path=/trunk/; revision=35871 --- e-util/ChangeLog | 7 +++++++ e-util/e-plugin.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index ca1e193c40..785383c11b 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2008-07-31 Matthew Barnes + + ** Fixes part of bug #545568 + + * e-plugin.c (ep_load): + Make sure system plugins are enabled on startup. + 2008-07-01 Matthew Barnes ** Fixes part of bug #540282 diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index b22c59b5f9..85c1edb060 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -470,9 +470,10 @@ ep_load(const char *filename, int load_level) /* README: May be we can use load_levels to achieve the same thing. But it may be confusing for a plugin writer */ is_system_plugin = e_plugin_xml_prop (root, "system_plugin"); - if (is_system_plugin && !strcmp (is_system_plugin, "true")) + if (is_system_plugin && !strcmp (is_system_plugin, "true")) { + e_plugin_enable (ep, TRUE); ep->flags |= E_PLUGIN_FLAGS_SYSTEM_PLUGIN; - else + } else ep->flags &= ~E_PLUGIN_FLAGS_SYSTEM_PLUGIN; g_free (is_system_plugin); -- cgit v1.2.3 From 434bc25ed6b3f458f3bf119e76bd8b2bcffe5178 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 11 Aug 2008 17:04:32 +0000 Subject: ** Fixes bug #546892 2008-08-11 Matthew Barnes ** Fixes bug #546892 * e-util/e-icon-factory.c (e_icon_factory_get_image): Kill this function. Use gtk_image_new_from_icon_name(). * e-util/e-icon-factory.c (e_icon_factory_get_icon_list): Kill this function. Use gtk_window_set_icon_name(). * widgets/misc/e-activity-handler.c: * widgets/misc/e-task-widget.c: Purge the GdkPixbuf arguments from the API. We've been ignoring them since the spinner icon was added. * addressbook/gui/contact-editor/e-contact-editor-fullname.c: * addressbook/gui/contact-editor/e-contact-editor-im.c: * addressbook/gui/contact-editor/e-contact-editor-address.c: * calendar/gui/alarm-notify/alarm-notify-dialog.c: * calendar/gui/dialogs/alarm-dialog.c: * calendar/gui/dialogs/alarm-list-dialog.c: * calendar/gui/dialogs/cal-attachment-select-file.c: * calendar/gui/dialogs/changed-comp.c: * calendar/gui/dialogs/delete-error.c: * calendar/gui/dialogs/select-source-dialog.c: * mail/mail-send-recv.c: * mail/message-tag-followup.c: * widgets/misc/e-combo-button.c: * widgets/misc/e-info-label.c: * widgets/misc/e-url-entry.c: * widgets/misc/e-task-widget.c: Prefer gtk_window_set_icon_name() over gtk_window_set_icon_list(). * addressbook/gui/contact-editor/e-contact-editor-im.c: * calendar/gui/dialogs/event-page.c: * calendar/gui/e-timezone-entry.c: * e-util/e-gui-utils.c: * e-util/e-popup.c: * plugins/import-ics-attachments/icsimporter.c: * plugins/itip-formatter/itip-view.c: * mail/em-folder-browser.c: * mail/em-format-html-display.c: * mail/mail-send-recv.c: * mail/message-tag-followup.c: Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image(). * calendar/gui/alarm-notify/alarm-queue.c: * plugins/mail-notification/mail-notification.c: Prefer gtk_status_icon_set_from_icon_name() over gtk_status_icon_set_from_pixbuf(). * addressbook/gui/component/addressbook-view.c: * calendar/gui/e-calendar-table.c: * calendar/gui/e-calendar-view.c: * calendar/gui/e-memo-table.c: * mail/mail-mt.c: e_activity_handler_operation_started() no longer takes a GdkPixbuf. It was ignoring the pixbuf anyway ever since we added a spinner icon. svn path=/trunk/; revision=35958 --- e-util/ChangeLog | 14 +++++++++++++ e-util/e-config.c | 2 -- e-util/e-event.c | 2 -- e-util/e-gui-utils.c | 4 ++-- e-util/e-icon-factory.c | 56 ------------------------------------------------- e-util/e-icon-factory.h | 4 ---- e-util/e-import.c | 2 -- e-util/e-popup.c | 10 ++------- 8 files changed, 18 insertions(+), 76 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 785383c11b..bd5c7e3e76 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,17 @@ +2008-08-11 Matthew Barnes + + ** Fixes part of bug #546892 + + * e-gui-utils.c: + * e-popup.c: + Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image(). + + * e-icon-factory.c (e_icon_factory_get_image): + Kill this function. Use gtk_image_new_from_icon_name(). + + * e-icon-factory.c (e_icon_factory_get_icon_list): + Kill this function. Use gtk_window_set_icon_name(). + 2008-07-31 Matthew Barnes ** Fixes part of bug #545568 diff --git a/e-util/e-config.c b/e-util/e-config.c index 939ade0380..b10a11fd20 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -35,8 +35,6 @@ #include "e-config.h" -#include - #include #define d(x) diff --git a/e-util/e-event.c b/e-util/e-event.c index e105bc1aa7..f8d634feec 100644 --- a/e-util/e-event.c +++ b/e-util/e-event.c @@ -31,8 +31,6 @@ #include "e-event.h" -#include - #include #include diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c index c354597153..c4fef1ba16 100644 --- a/e-util/e-gui-utils.c +++ b/e-util/e-gui-utils.c @@ -18,7 +18,6 @@ #include #include "e-gui-utils.h" -#include #include #include @@ -62,7 +61,8 @@ GtkWidget *e_create_image_widget(gchar *name, GtkWidget *w; if (string1) { - w = e_icon_factory_get_image (string1, E_ICON_SIZE_DIALOG); + w = gtk_image_new_from_icon_name ( + string1, GTK_ICON_SIZE_DIALOG); gtk_misc_set_alignment (GTK_MISC (w), 0.5, 0.5); diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 457735f90b..2ca724c5f2 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -353,62 +353,6 @@ e_icon_factory_get_icon (const char *icon_name, int icon_size) return pixbuf; } -GtkWidget * -e_icon_factory_get_image (const char *icon_name, int icon_size) -{ - GdkPixbuf *pixbuf; - GtkWidget *image; - - pixbuf = e_icon_factory_get_icon (icon_name, icon_size); - image = gtk_image_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - - return image; -} - -/** - * e_icon_factory_get_icon_list: - * @icon_name: name of the icon - * - * Returns a list of GdkPixbufs of the requested name suitable for - * gtk_window_set_icon_list(). - **/ -GList * -e_icon_factory_get_icon_list (const char *icon_name) -{ - static int icon_list_sizes[] = { 128, 64, 48, 32, 16 }; - GList *list = NULL; - char *icon_key; - Icon *icon; - int size, i; - - if (!icon_name || !strcmp (icon_name, "")) - return NULL; - - g_static_mutex_lock (&mutex); - - icon_key = g_alloca (strlen (icon_name) + 9); - - for (i = 0; i < G_N_ELEMENTS (icon_list_sizes); i++) { - size = icon_list_sizes[i]; - sprintf (icon_key, "%dx%d/%s", size, size, icon_name); - - if (!(icon = g_hash_table_lookup (name_to_icon, icon_key))) { - if ((icon = load_icon (icon_key, icon_name, size, FALSE))) - g_hash_table_insert (name_to_icon, icon->name, icon); - } - - if (icon && icon->pixbuf) { - list = g_list_prepend (list, icon->pixbuf); - g_object_ref (icon->pixbuf); - } - } - - g_static_mutex_unlock (&mutex); - - return list; -} - /** * e_icon_factory_pixbuf_scale * Scales pixbuf to desired size. diff --git a/e-util/e-icon-factory.h b/e-util/e-icon-factory.h index 1a0954966e..9cecbbd116 100644 --- a/e-util/e-icon-factory.h +++ b/e-util/e-icon-factory.h @@ -50,10 +50,6 @@ char *e_icon_factory_get_icon_filename (const char *icon_name, int icon_siz GdkPixbuf *e_icon_factory_get_icon (const char *icon_name, int icon_size); -GtkWidget *e_icon_factory_get_image (const char *icon_name, int icon_size); - -GList *e_icon_factory_get_icon_list (const char *icon_name); - GdkPixbuf *e_icon_factory_pixbuf_scale (GdkPixbuf *pixbuf, int width, int height); #endif /* _E_ICON_FACTORY_H_ */ diff --git a/e-util/e-import.c b/e-util/e-import.c index 88a75ac422..da4fffb346 100644 --- a/e-util/e-import.c +++ b/e-util/e-import.c @@ -35,8 +35,6 @@ #include "e-import.h" -#include - #include #define d(x) diff --git a/e-util/e-popup.c b/e-util/e-popup.c index f411c2d249..1d2e808bc3 100644 --- a/e-util/e-popup.c +++ b/e-util/e-popup.c @@ -31,8 +31,6 @@ #include "e-popup.h" -#include - #include #define d(x) @@ -357,12 +355,8 @@ ep_build_tree(struct _item_node *inode, guint32 mask) if (item->image) { GtkWidget *image; - /* work-around e-icon-factory not doing GTK_STOCK stuff */ - if (strncmp((char *)item->image, "gtk-", 4) == 0) - image = gtk_image_new_from_stock((char *)item->image, GTK_ICON_SIZE_MENU); - else - image = e_icon_factory_get_image((char *)item->image, E_ICON_SIZE_MENU); - + image = gtk_image_new_from_icon_name ( + (gchar *) item->image, GTK_ICON_SIZE_MENU); gtk_widget_show(image); menuitem = (GtkMenuItem *)gtk_image_menu_item_new(); gtk_image_menu_item_set_image((GtkImageMenuItem *)menuitem, image); -- cgit v1.2.3 From fcc193d767c44893041713c3bc9176738040acd1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 13 Aug 2008 15:29:35 +0000 Subject: Remove this unused function. 2008-08-13 Matthew Barnes * e-util/e-gui-utils.c (e_create_image_widget): Remove this unused function. * e-util/e-util.h: Cosmetic cleanups. svn path=/trunk/; revision=35980 --- e-util/ChangeLog | 7 +++++++ e-util/e-gui-utils.c | 27 --------------------------- e-util/e-gui-utils.h | 1 - e-util/e-util.h | 34 +++++++++++++++++----------------- 4 files changed, 24 insertions(+), 45 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index bd5c7e3e76..50d649d4d0 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2008-08-13 Matthew Barnes + + * e-gui-utils.c (e_create_image_widget): + Remove this unused function. + + * e-util.h: Cosmetic cleanups. + 2008-08-11 Matthew Barnes ** Fixes part of bug #546892 diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c index c4fef1ba16..cff2b500b0 100644 --- a/e-util/e-gui-utils.c +++ b/e-util/e-gui-utils.c @@ -52,30 +52,3 @@ e_icon_for_mime_type (const char *mime_type, int size_hint) return pixbuf; } - -GtkWidget *e_create_image_widget(gchar *name, - gchar *string1, gchar *string2, - gint int1, gint int2) -{ - GtkWidget *alignment = NULL; - GtkWidget *w; - - if (string1) { - w = gtk_image_new_from_icon_name ( - string1, GTK_ICON_SIZE_DIALOG); - - gtk_misc_set_alignment (GTK_MISC (w), 0.5, 0.5); - - alignment = gtk_widget_new(gtk_alignment_get_type(), - "child", w, - "xalign", (double) 0, - "yalign", (double) 0, - "xscale", (double) 0, - "yscale", (double) 0, - NULL); - - gtk_widget_show_all (alignment); - } - - return alignment; -} diff --git a/e-util/e-gui-utils.h b/e-util/e-gui-utils.h index 740c77e95e..bbeefa9c61 100644 --- a/e-util/e-gui-utils.h +++ b/e-util/e-gui-utils.h @@ -4,6 +4,5 @@ #include GdkPixbuf *e_icon_for_mime_type (const char *mime_type, int size); -GtkWidget *e_create_image_widget (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2); #endif /* E_GUI_UTILS_H */ diff --git a/e-util/e-util.h b/e-util/e-util.h index 2beac806de..63cb6f4a5c 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -30,13 +30,10 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include +G_BEGIN_DECLS + typedef enum { E_FOCUS_NONE, E_FOCUS_CURRENT, @@ -104,27 +101,30 @@ gchar * e_ascii_dtostr (gchar *buffer, /* Alternating char * and int arguments with a NULL char * to end. Less than 0 for the int means copy the whole string. */ -gchar * e_strdup_append_strings (gchar *first_string, +gchar * e_strdup_append_strings (gchar *first_string, ...); -cairo_font_options_t * get_font_options (void); +cairo_font_options_t * + get_font_options (void); void e_file_update_save_path (gchar *uri, gboolean free); gchar * e_file_get_save_path (void); -gboolean e_file_lock_create (void); -void e_file_lock_destroy (void); -gboolean e_file_lock_exists (void); +gboolean e_file_lock_create (void); +void e_file_lock_destroy (void); +gboolean e_file_lock_exists (void); -char *e_util_guess_mime_type (const char *filename); -char *e_util_filename_to_uri (const char *filename); -char *e_util_uri_to_filename (const char *uri); +gchar * e_util_guess_mime_type (const gchar *filename); +gchar * e_util_filename_to_uri (const gchar *filename); +gchar * e_util_uri_to_filename (const gchar *uri); -gboolean e_util_read_file (const char *filename, gboolean filename_is_uri, char **buffer, gsize *read, GError **error); +gboolean e_util_read_file (const gchar *filename, + gboolean filename_is_uri, + gchar **buffer, + gsize *read, + GError **error); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* _E_UTIL_H_ */ -- cgit v1.2.3 From 09cfe5d5690a75e8f79c94b052980dd191965054 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 14 Aug 2008 19:21:10 +0000 Subject: New convenience function for launching help from Evolution. Displays an 2008-08-14 Matthew Barnes * e-util/e-util.c (e_display_help): New convenience function for launching help from Evolution. Displays an error dialog over the given parent window if an error occurs. * addressbook/gui/contact-editor/e-contact-editor.c: * calendar/gui/dialogs/comp-editor.c: * plugins/email-custom-header/gui/contact-editor/e-contact-editor.c: * plugins/exchange-operations/exchange-send-options.c: * widgets/misc/e-multi-config-dialog.c: * widgets/misc/e-send-options.c: Use e_display_help() for displaying help. svn path=/trunk/; revision=35991 --- e-util/ChangeLog | 7 +++++++ e-util/e-util.c | 42 +++++++++++++++++++++++++++++++++++++++--- e-util/e-util.h | 4 +++- 3 files changed, 49 insertions(+), 4 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 50d649d4d0..0c80024a22 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2008-08-14 Matthew Barnes + + * e-util.c (e_display_help): + New convenience function for launching help from Evolution. + Displays an error dialog over the given parent window if an + error occurs. + 2008-08-13 Matthew Barnes * e-gui-utils.c (e_create_image_widget): diff --git a/e-util/e-util.c b/e-util/e-util.c index 116ebd3f55..815f75e033 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -35,10 +35,11 @@ #include #include -#include -#include -#include #include +#include +#include +#include +#include #include #ifdef G_OS_WIN32 @@ -69,6 +70,41 @@ e_get_user_data_dir (void) return dirname; } +/** + * e_display_help: + * @parent: a parent #GtkWindow or %NULL + * @link_id: help section to present or %NULL + * + * Opens the user documentation to the section given by @link_id, or to the + * table of contents if @link_id is %NULL. If the user documentation cannot + * be opened, it presents a dialog describing the error. The dialog is set + * as transient to @parent if @parent is non-%NULL. + **/ +void +e_display_help (GtkWindow *parent, + const gchar *link_id) +{ + GtkWidget *dialog; + GError *error = NULL; + + if (gnome_help_display ("evolution.xml", link_id, &error)) + return; + + dialog = gtk_message_dialog_new_with_markup ( + parent, GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, + "%s", + _("Could not display help for Evolution.")); + + gtk_message_dialog_format_secondary_text ( + GTK_MESSAGE_DIALOG (dialog), "%s", error->message); + + gtk_dialog_run (GTK_DIALOG (dialog)); + + gtk_widget_destroy (dialog); + g_error_free (error); +} + /** * e_str_without_underscores: * @s: the string to strip underscores from. diff --git a/e-util/e-util.h b/e-util/e-util.h index 63cb6f4a5c..484ab59702 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -25,7 +25,7 @@ #define _E_UTIL_H_ #include -#include +#include #include #include #include @@ -42,6 +42,8 @@ typedef enum { } EFocus; const gchar * e_get_user_data_dir (void); +void e_display_help (GtkWindow *parent, + const gchar *link_id); char * e_str_without_underscores (const char *s); gint e_str_compare (gconstpointer x, -- cgit v1.2.3 From b29fa407bd8373edff0ae1482601dfc5eb3b6eab Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sat, 16 Aug 2008 01:08:03 +0000 Subject: Make evolution respect GTK_ICON_SIZE changes, part of bug #416258. 2008-08-16 Gilles Dartiguelongue * e-icon-factory.c: (e_icon_size_to_gtk_icon_size), (e_icon_factory_get_icon_filename), (e_icon_factory_get_icon): Make evolution respect GTK_ICON_SIZE changes, part of bug #416258. svn path=/trunk/; revision=36000 --- e-util/ChangeLog | 6 ++++ e-util/e-icon-factory.c | 73 +++++++++++++++++++++++++++++-------------------- 2 files changed, 49 insertions(+), 30 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 0c80024a22..94a063ff3b 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,9 @@ +2008-08-16 Gilles Dartiguelongue + + * e-icon-factory.c: (e_icon_size_to_gtk_icon_size), + (e_icon_factory_get_icon_filename), (e_icon_factory_get_icon): + Make evolution respect GTK_ICON_SIZE changes, part of bug #416258. + 2008-08-14 Matthew Barnes * e-util.c (e_display_help): diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 2ca724c5f2..e1e60f91fd 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -34,22 +34,14 @@ #include #endif +#include + #include "e-icon-factory.h" #include "e-util-private.h" #include "art/broken-image-16.xpm" #include "art/broken-image-24.xpm" -static int sizes[E_ICON_NUM_SIZES] = { - 16, /* menu */ - 20, /* button */ - 18, /* small toolbar */ - 24, /* large toolbar */ - 32, /* dnd */ - 48, /* dialog */ -}; - - typedef struct { char *name; GdkPixbuf *pixbuf; @@ -173,21 +165,25 @@ load_icon (const char *icon_key, const char *icon_name, int size, int scale) return icon_new (icon_key, pixbuf); } - -/* temporary workaround for code that has not yet been ported to the new icon_size API */ -static int -pixel_size_to_icon_size (int pixel_size) +static GtkIconSize +e_icon_size_to_gtk_icon_size (guint size) { - int i, icon_size = -1; - - for (i = 0; i < E_ICON_NUM_SIZES; i++) { - if (pixel_size == sizes[i]) { - icon_size = i; - break; - } + switch (size) { + case E_ICON_SIZE_MENU: + return GTK_ICON_SIZE_MENU; + case E_ICON_SIZE_BUTTON: + return GTK_ICON_SIZE_BUTTON; + case E_ICON_SIZE_SMALL_TOOLBAR: + return GTK_ICON_SIZE_SMALL_TOOLBAR; + case E_ICON_SIZE_LARGE_TOOLBAR: + return GTK_ICON_SIZE_LARGE_TOOLBAR; + case E_ICON_SIZE_DND: + return GTK_ICON_SIZE_DND; + case E_ICON_SIZE_DIALOG: + return GTK_ICON_SIZE_DIALOG; + default: + g_assert_not_reached (); } - - return icon_size; } static void @@ -264,21 +260,30 @@ e_icon_factory_get_icon_filename (const char *icon_name, int icon_size) { GtkIconInfo *icon_info; char *filename; + gint width, height; g_return_val_if_fail (icon_name != NULL, NULL); g_return_val_if_fail (strcmp (icon_name, ""), NULL); if (icon_size >= E_ICON_NUM_SIZES) { - g_warning ( + g_critical ( "calling %s with unknown icon_size value (%d)", G_STRFUNC, icon_size); - if ((icon_size = pixel_size_to_icon_size (icon_size)) == -1) + /* if ((icon_size = pixel_size_to_icon_size (icon_size)) == -1)*/ return NULL; } + if (! gtk_icon_size_lookup_for_settings (gtk_settings_get_default (), + e_icon_size_to_gtk_icon_size (icon_size), + &width, &height)) + return NULL; + + g_message ("Size is %d", icon_size); + g_message ("looking up %s at %dx%d", icon_name, width, height); + g_static_mutex_lock (&mutex); icon_info = gtk_icon_theme_lookup_icon ( - icon_theme, icon_name, sizes[icon_size], 0); + icon_theme, icon_name, height, 0); if (icon_info != NULL) { filename = g_strdup ( gtk_icon_info_get_filename (icon_info)); @@ -310,17 +315,25 @@ e_icon_factory_get_icon (const char *icon_name, int icon_size) GdkPixbuf *pixbuf; char *icon_key; Icon *icon; - int size; + int size, width, height; if (icon_size >= E_ICON_NUM_SIZES) { - g_warning ( + g_critical ( "calling %s with unknown icon_size value (%d)", G_STRFUNC, icon_size); - if ((icon_size = pixel_size_to_icon_size (icon_size)) == -1) + /*if ((icon_size = pixel_size_to_icon_size (icon_size)) == -1) */ return NULL; } - size = sizes[icon_size]; + if (! gtk_icon_size_lookup_for_settings (gtk_settings_get_default (), + e_icon_size_to_gtk_icon_size (icon_size), + &width, &height)) + return NULL; + + g_message ("Size is %d", icon_size); + g_message ("looking up %s at %dx%d", icon_name, width, height); + + size = height; if (icon_name == NULL || !strcmp (icon_name, "")) { if (size >= 24) -- cgit v1.2.3 From 3fb7b7d92bc6b23c7b71a472050fa4ffa7811d30 Mon Sep 17 00:00:00 2001 From: Bharath Acharya Date: Mon, 18 Aug 2008 06:15:31 +0000 Subject: Added a debug macro and turned it off. 2008-08-18 Bharath Acharya * e-icon-factory.c: (e_icon_factory_get_icon_filename), (e_icon_factory_get_icon): Added a debug macro and turned it off. svn path=/trunk/; revision=36013 --- e-util/ChangeLog | 5 +++++ e-util/e-icon-factory.c | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 94a063ff3b..b227df58fe 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,8 @@ +2008-08-18 Bharath Acharya + + * e-icon-factory.c: (e_icon_factory_get_icon_filename), + (e_icon_factory_get_icon): Added a debug macro and turned it off. + 2008-08-16 Gilles Dartiguelongue * e-icon-factory.c: (e_icon_size_to_gtk_icon_size), diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index e1e60f91fd..aa053001c5 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -41,6 +41,7 @@ #include "art/broken-image-16.xpm" #include "art/broken-image-24.xpm" +#define d(x) typedef struct { char *name; @@ -278,8 +279,8 @@ e_icon_factory_get_icon_filename (const char *icon_name, int icon_size) &width, &height)) return NULL; - g_message ("Size is %d", icon_size); - g_message ("looking up %s at %dx%d", icon_name, width, height); + d(g_message ("Size is %d", icon_size)); + d(g_message ("looking up %s at %dx%d", icon_name, width, height)); g_static_mutex_lock (&mutex); icon_info = gtk_icon_theme_lookup_icon ( @@ -330,8 +331,8 @@ e_icon_factory_get_icon (const char *icon_name, int icon_size) &width, &height)) return NULL; - g_message ("Size is %d", icon_size); - g_message ("looking up %s at %dx%d", icon_name, width, height); + d(g_message ("Size is %d", icon_size)); + d(g_message ("looking up %s at %dx%d", icon_name, width, height)); size = height; -- cgit v1.2.3 From 1bad915150e2d5e97cbbf1a77f7a85e338c07f28 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Wed, 27 Aug 2008 10:33:22 +0000 Subject: License Changes svn path=/trunk/; revision=36116 --- e-util/ChangeLog | 35 ++++++++++++++++++++++++++++++ e-util/e-bconf-map.c | 30 ++++++++++++------------- e-util/e-bconf-map.h | 30 ++++++++++++------------- e-util/e-bit-array.c | 32 +++++++++++++-------------- e-util/e-bit-array.h | 32 +++++++++++++-------------- e-util/e-categories-config.h | 21 +++++++++++++++--- e-util/e-config.h | 29 +++++++++++++------------ e-util/e-cursor.h | 28 +++++++++++++----------- e-util/e-event.h | 29 +++++++++++++------------ e-util/e-folder-map.c | 29 +++++++++++++------------ e-util/e-folder-map.h | 30 ++++++++++++------------- e-util/e-fsutils.c | 26 ++++++++++++---------- e-util/e-icon-factory.h | 25 +++++++++++---------- e-util/e-import.h | 29 +++++++++++++------------ e-util/e-logger.c | 28 +++++++++++++----------- e-util/e-menu.h | 29 +++++++++++++------------ e-util/e-pilot-util.h | 27 +++++++++++++---------- e-util/e-popup.h | 29 +++++++++++++------------ e-util/e-print.c | 28 +++++++++++++----------- e-util/e-print.h | 28 ++++++++++++++---------- e-util/e-profile-event.h | 29 +++++++++++++------------ e-util/e-signature-list.c | 30 ++++++++++++------------- e-util/e-signature-list.h | 30 ++++++++++++------------- e-util/e-signature.c | 30 ++++++++++++------------- e-util/e-signature.h | 30 ++++++++++++------------- e-util/e-sorter.h | 32 +++++++++++++-------------- e-util/e-text-event-processor-emacs-like.h | 32 +++++++++++++-------------- e-util/e-text-event-processor-types.h | 32 +++++++++++++-------------- e-util/e-util-labels.h | 29 ++++++++++++------------- e-util/e-util-private.h | 32 +++++++++++++-------------- e-util/e-win32-reloc.c | 32 +++++++++++++-------------- 31 files changed, 492 insertions(+), 420 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index b227df58fe..5fb0abb397 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,38 @@ +2008-08-27 Sankar P + +License Changes + + * e-bconf-map.c: + * e-bconf-map.h: + * e-bit-array.c: + * e-bit-array.h: + * e-categories-config.h: + * e-config.h: + * e-cursor.h: + * e-event.h: + * e-folder-map.c: + * e-folder-map.h: + * e-fsutils.c: + * e-icon-factory.h: + * e-import.h: + * e-logger.c: + * e-menu.h: + * e-pilot-util.h: + * e-popup.h: + * e-print.c: + * e-print.h: + * e-profile-event.h: + * e-signature-list.c: + * e-signature-list.h: + * e-signature.c: + * e-signature.h: + * e-sorter.h: + * e-text-event-processor-emacs-like.h: + * e-text-event-processor-types.h: + * e-util-labels.h: + * e-util-private.h: + * e-win32-reloc.c: + 2008-08-18 Bharath Acharya * e-icon-factory.c: (e_icon_factory_get_icon_filename), diff --git a/e-util/e-bconf-map.c b/e-util/e-bconf-map.c index 785e5033f3..7d874b896b 100644 --- a/e-util/e-bconf-map.c +++ b/e-util/e-bconf-map.c @@ -1,26 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Jeffrey Stedfast * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * 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 + * Lesser General Public License for more details. * - * 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 Lesser General Public + * License along with the program; if not, see * - * 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. + * + * Authors: + * Jeffrey Stedfast + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - #ifdef HAVE_CONFIG_H #include #endif diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h index 3523ccc906..f47368de78 100644 --- a/e-util/e-bconf-map.h +++ b/e-util/e-bconf-map.h @@ -1,26 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Jeffrey Stedfast * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * 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 + * Lesser General Public License for more details. * - * 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 Lesser General Public + * License along with the program; if not, see * - * 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. + * + * Authors: + * Jeffrey Stedfast + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - #ifndef __E_BCONF_MAP_H__ #define __E_BCONF_MAP_H__ diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c index a8d02d6b17..fdd3d3fe01 100644 --- a/e-util/e-bit-array.c +++ b/e-util/e-bit-array.c @@ -1,24 +1,24 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-bit-array.c - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: - * Chris Lahey * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 - * Library General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. */ #include diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h index a939cd60b5..ea8ed89797 100644 --- a/e-util/e-bit-array.h +++ b/e-util/e-bit-array.h @@ -1,24 +1,24 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-bit-array.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: - * Chris Lahey * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 - * Library General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. */ #ifndef _E_BIT_ARRAY_H_ diff --git a/e-util/e-categories-config.h b/e-util/e-categories-config.h index daa3efc18c..9eff161375 100644 --- a/e-util/e-categories-config.h +++ b/e-util/e-categories-config.h @@ -1,11 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* + * * Categories configuration. * - * Author: - * Rodrigo Moya + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Rodrigo Moya * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef __E_CATEGORIES_CONFIG_H__ diff --git a/e-util/e-config.h b/e-util/e-config.h index b1cee1379c..2eeb663d59 100644 --- a/e-util/e-config.h +++ b/e-util/e-config.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* * - * Authors: Michel Zucchi + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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 + * Lesser General Public License for more details. * - * 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Michel Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-cursor.h b/e-util/e-cursor.h index 562d8e873d..9e1a228316 100644 --- a/e-util/e-cursor.h +++ b/e-util/e-cursor.h @@ -1,21 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * +/* * - * Authors: Srinivasa Ragavan + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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 + * Lesser General Public License for more details. * - * 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Srinivasa Ragavan + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-event.h b/e-util/e-event.h index 4be869b62d..074d8deed2 100644 --- a/e-util/e-event.h +++ b/e-util/e-event.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Authors: Michel Zucchi + * 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 + * Lesser General Public License for more details. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Michel Zucchi * - * 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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-folder-map.c b/e-util/e-folder-map.c index 885334d4a4..3475d61a70 100644 --- a/e-util/e-folder-map.c +++ b/e-util/e-folder-map.c @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Jeffrey Stedfast * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * 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 + * Lesser General Public License for more details. * - * 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 Lesser General Public + * License along with the program; if not, see * - * 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. + * + * Authors: + * Jeffrey Stedfast + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-folder-map.h b/e-util/e-folder-map.h index 269936cbfd..e61dc140ff 100644 --- a/e-util/e-folder-map.h +++ b/e-util/e-folder-map.h @@ -1,26 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Jeffrey Stedfast * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * 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 + * Lesser General Public License for more details. * - * 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 Lesser General Public + * License along with the program; if not, see * - * 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. + * + * Authors: + * Jeffrey Stedfast + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - #ifndef __E_FOLDER_MAP_H__ #define __E_FOLDER_MAP_H__ diff --git a/e-util/e-fsutils.c b/e-util/e-fsutils.c index 899ca2bb56..28b434f291 100644 --- a/e-util/e-fsutils.c +++ b/e-util/e-fsutils.c @@ -1,21 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- - * - * Authors: Michael Zucchi - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) +/* * * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-icon-factory.h b/e-util/e-icon-factory.h index 9cecbbd116..f8d1fc2fc7 100644 --- a/e-util/e-icon-factory.h +++ b/e-util/e-icon-factory.h @@ -1,23 +1,24 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-icon-factory.h - Icon factory for the Evolution shell. - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) +/* * * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _E_ICON_FACTORY_H_ diff --git a/e-util/e-import.h b/e-util/e-import.h index 9fab14361f..9a9994150b 100644 --- a/e-util/e-import.h +++ b/e-util/e-import.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* * - * Authors: Michel Zucchi + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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 + * Lesser General Public License for more details. * - * 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Michel Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-logger.c b/e-util/e-logger.c index 9890cbd941..0c95520fe8 100644 --- a/e-util/e-logger.c +++ b/e-util/e-logger.c @@ -1,21 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* * - * Authors: Srinivasa Ragavan + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * + * 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 + * Lesser General Public License for more details. * - * 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Srinivasa Ragavan + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-menu.h b/e-util/e-menu.h index b71bb431d7..e6ee11f304 100644 --- a/e-util/e-menu.h +++ b/e-util/e-menu.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* * - * Authors: Michel Zucchi + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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 + * Lesser General Public License for more details. * - * 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Michel Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h index 447aa74450..8559918eb3 100644 --- a/e-util/e-pilot-util.h +++ b/e-util/e-pilot-util.h @@ -1,23 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* Evolution Conduits - Pilot Map routines +/* * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: JP Rosevear + *Evolution Conduits - Pilot Map routines * * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * JP Rosevear + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * 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. */ #include diff --git a/e-util/e-popup.h b/e-util/e-popup.h index 6c7ad0782c..877f5dfce4 100644 --- a/e-util/e-popup.h +++ b/e-util/e-popup.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* * - * Authors: Michel Zucchi + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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 + * Lesser General Public License for more details. * - * 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Michel Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-print.c b/e-util/e-print.c index a50a3ef90c..4cc3b8155e 100644 --- a/e-util/e-print.c +++ b/e-util/e-print.c @@ -1,22 +1,24 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* e-print.c - Uniform print setting/dialog routines for Evolution - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: JP Rosevear +/* * * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * JP Rosevear + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * 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. */ #include "e-print.h" diff --git a/e-util/e-print.h b/e-util/e-print.h index ea87ff246c..93cbe2d10d 100644 --- a/e-util/e-print.h +++ b/e-util/e-print.h @@ -1,22 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* e-print.c - Uniform print setting/dialog routines for Evolution +/* * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: JP Rosevear + * Uniform print setting/dialog routines for Evolution * * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * JP Rosevear + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * 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. */ #ifndef __E_PRINT__ diff --git a/e-util/e-profile-event.h b/e-util/e-profile-event.h index 213a060eb0..b7ac21adc1 100644 --- a/e-util/e-profile-event.h +++ b/e-util/e-profile-event.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* * - * Authors: Michel Zucchi + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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 + * Lesser General Public License for more details. * - * 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Michel Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c index cfa09ac963..898bff9057 100644 --- a/e-util/e-signature-list.c +++ b/e-util/e-signature-list.c @@ -1,26 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Jeffrey Stedfast * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * 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 + * Lesser General Public License for more details. * - * 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 Lesser General Public + * License along with the program; if not, see * - * 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. + * + * Authors: + * Jeffrey Stedfast + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - #ifdef HAVE_CONFIG_H #include #endif diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h index d35aff3703..4edd48a7dd 100644 --- a/e-util/e-signature-list.h +++ b/e-util/e-signature-list.h @@ -1,26 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Jeffrey Stedfast * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * 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 + * Lesser General Public License for more details. * - * 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 Lesser General Public + * License along with the program; if not, see * - * 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. + * + * Authors: + * Jeffrey Stedfast + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - #ifndef __E_SIGNATURE_LIST__ #define __E_SIGNATURE_LIST__ diff --git a/e-util/e-signature.c b/e-util/e-signature.c index 24f69ea45b..2d0df59579 100644 --- a/e-util/e-signature.c +++ b/e-util/e-signature.c @@ -1,26 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Jeffrey Stedfast * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * 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 + * Lesser General Public License for more details. * - * 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 Lesser General Public + * License along with the program; if not, see * - * 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. + * + * Authors: + * Jeffrey Stedfast + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - #ifdef HAVE_CONFIG_H #include #endif diff --git a/e-util/e-signature.h b/e-util/e-signature.h index d077ff5b43..cc5309c7c1 100644 --- a/e-util/e-signature.h +++ b/e-util/e-signature.h @@ -1,26 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Jeffrey Stedfast * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * 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 + * Lesser General Public License for more details. * - * 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 Lesser General Public + * License along with the program; if not, see * - * 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. + * + * Authors: + * Jeffrey Stedfast + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - #ifndef __E_SIGNATURE_H__ #define __E_SIGNATURE_H__ diff --git a/e-util/e-sorter.h b/e-util/e-sorter.h index 7282a1b4b9..365d66a461 100644 --- a/e-util/e-sorter.h +++ b/e-util/e-sorter.h @@ -1,24 +1,24 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-sorter.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: - * Chris Lahey * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 - * Library General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. */ #ifndef _E_SORTER_H_ diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h index c478566db3..87e3fa797d 100644 --- a/e-util/e-text-event-processor-emacs-like.h +++ b/e-util/e-text-event-processor-emacs-like.h @@ -1,24 +1,24 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-text-event-processor-emacs-like.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: - * Chris Lahey * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 - * Library General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. */ #ifndef __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__ diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h index da0092eb65..9caf2abe6d 100644 --- a/e-util/e-text-event-processor-types.h +++ b/e-util/e-text-event-processor-types.h @@ -1,24 +1,24 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-text-event-processor-types.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: - * Chris Lahey * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 - * Library General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. */ #ifndef __E_TEXT_EVENT_PROCESSOR_TYPES_H__ diff --git a/e-util/e-util-labels.h b/e-util/e-util-labels.h index 992a97062c..a9dd5613bc 100644 --- a/e-util/e-util-labels.h +++ b/e-util/e-util-labels.h @@ -1,22 +1,21 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* e-util-labels.h +/* * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library 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 + * Lesser General Public License for more details. * - * This library 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 - * Library General Public License for more details. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ #ifndef _E_UTIL_LABELS_H diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h index c4b2749499..cca11e2477 100644 --- a/e-util/e-util-private.h +++ b/e-util/e-util-private.h @@ -1,24 +1,24 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-util-private.h: Private functions for Evolution (not just for libeutil) - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: - * Tor Lillqvist * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 - * Library General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Tor Lillqvist + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. */ #ifndef _E_UTIL_PRIVATE_H_ diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c index bffc099ec6..1c8c5d3f18 100644 --- a/e-util/e-win32-reloc.c +++ b/e-util/e-win32-reloc.c @@ -1,24 +1,24 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-win32-reloc.c: Support relocatable installation on Win32 - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: - * Tor Lillqvist * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 - * Library General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Tor Lillqvist + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. */ #include -- cgit v1.2.3 From 14fa5c8a8cf736e3207b9d9e414586d9ff3a623f Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Tue, 2 Sep 2008 16:25:53 +0000 Subject: Change License from GPL to LGPL. 2nd batch. More changes to come. svn path=/trunk/; revision=36247 --- e-util/ChangeLog | 39 ++++++++++++++++++++++++++++++ e-util/e-categories-config.c | 20 ++++++++++++--- e-util/e-config-listener.c | 20 ++++++++++++--- e-util/e-config-listener.h | 20 ++++++++++++--- e-util/e-config.c | 28 ++++++++++----------- e-util/e-corba-utils.c | 29 +++++++++++----------- e-util/e-corba-utils.h | 29 +++++++++++----------- e-util/e-cursor.c | 27 +++++++++++---------- e-util/e-dialog-utils.h | 26 ++++++++++---------- e-util/e-dialog-widgets.c | 28 +++++++++++---------- e-util/e-dialog-widgets.h | 28 +++++++++++---------- e-util/e-error.h | 27 +++++++++++---------- e-util/e-fsutils.h | 27 +++++++++++---------- e-util/e-gui-utils.h | 21 ++++++++++++++++ e-util/e-html-utils.h | 27 +++++++++++---------- e-util/e-import.c | 28 ++++++++++----------- e-util/e-logger.h | 27 +++++++++++---------- e-util/e-menu.c | 28 ++++++++++----------- e-util/e-mktemp.c | 26 ++++++++++---------- e-util/e-mktemp.h | 25 ++++++++++--------- e-util/e-pilot-map.c | 28 +++++++++++---------- e-util/e-pilot-map.h | 28 +++++++++++---------- e-util/e-pilot-util.c | 28 +++++++++++---------- e-util/e-plugin.h | 20 +++++++++++++++ e-util/e-popup.c | 28 ++++++++++----------- e-util/e-profile-event.c | 28 ++++++++++----------- e-util/e-request.c | 26 ++++++++++---------- e-util/e-request.h | 26 ++++++++++---------- e-util/e-sorter-array.h | 31 ++++++++++++------------ e-util/e-sorter.c | 31 ++++++++++++------------ e-util/e-text-event-processor-emacs-like.c | 31 ++++++++++++------------ e-util/e-text-event-processor.c | 31 ++++++++++++------------ e-util/e-text-event-processor.h | 31 ++++++++++++------------ e-util/e-util-labels.c | 30 +++++++++++------------ e-util/e-xml-utils.h | 31 ++++++++++++------------ 35 files changed, 545 insertions(+), 413 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 5fb0abb397..c16355f7f6 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,42 @@ +2008-09-02 Sankar P + +License Changes + + * e-categories-config.c: + * e-config-listener.c: + * e-config-listener.h: + * e-config.c: + * e-corba-utils.c: + * e-corba-utils.h: + * e-cursor.c: + * e-dialog-utils.h: + * e-dialog-widgets.c: + * e-dialog-widgets.h: + * e-error.h: + * e-fsutils.h: + * e-gui-utils.h: + * e-html-utils.h: + * e-import.c: + * e-logger.h: + * e-menu.c: + * e-mktemp.c: + * e-mktemp.h: + * e-pilot-map.c: + * e-pilot-map.h: + * e-pilot-util.c: + * e-plugin.h: + * e-popup.c: + * e-profile-event.c: + * e-request.c: + * e-request.h: + * e-sorter-array.h: + * e-sorter.c: + * e-text-event-processor-emacs-like.c: + * e-text-event-processor.c: + * e-text-event-processor.h: + * e-util-labels.c: + * e-xml-utils.h: + 2008-08-27 Sankar P License Changes diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c index 720bc6c58e..875b67974f 100644 --- a/e-util/e-categories-config.c +++ b/e-util/e-categories-config.c @@ -1,11 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Categories configuration. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Author: - * Rodrigo Moya + * 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Rodrigo Moya * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include diff --git a/e-util/e-config-listener.c b/e-util/e-config-listener.c index e1b565c8cf..83fb305347 100644 --- a/e-util/e-config-listener.c +++ b/e-util/e-config-listener.c @@ -1,11 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Configuration component listener * - * Author: - * Rodrigo Moya + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Rodrigo Moya * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include diff --git a/e-util/e-config-listener.h b/e-util/e-config-listener.h index 2535c77f5f..655bc3c1ec 100644 --- a/e-util/e-config-listener.h +++ b/e-util/e-config-listener.h @@ -1,11 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Configuration component listener * - * Author: - * Rodrigo Moya + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Rodrigo Moya * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef __E_CONFIG_LISTENER_H__ diff --git a/e-util/e-config.c b/e-util/e-config.c index b10a11fd20..d320bcd7af 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Michael Zucchi + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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 + * Lesser General Public License for more details. * - * 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-corba-utils.c b/e-util/e-corba-utils.c index 2638d20f4f..0288602a7e 100644 --- a/e-util/e-corba-utils.c +++ b/e-util/e-corba-utils.c @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* e-html-utils.c -* - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Ettore Perazzoli - * - * This library 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H diff --git a/e-util/e-corba-utils.h b/e-util/e-corba-utils.h index 259d86e8a5..979237929d 100644 --- a/e-util/e-corba-utils.h +++ b/e-util/e-corba-utils.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* e-corba-utils.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Ettore Perazzoli - * - * This library 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ #ifndef E_CORBA_UTILS_H diff --git a/e-util/e-cursor.c b/e-util/e-cursor.c index a312e6e72c..97e3989f9b 100644 --- a/e-util/e-cursor.c +++ b/e-util/e-cursor.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Authors: Srinivasa Ragavan + * 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 + * Lesser General Public License for more details. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Srinivasa Ragavan * - * 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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h index 3f5abbee8c..9d594122e2 100644 --- a/e-util/e-dialog-utils.h +++ b/e-util/e-dialog-utils.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-dialog-utils.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef E_DIALOG_UTILS_H diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c index ad74ad8cc7..d3987b07bc 100644 --- a/e-util/e-dialog-widgets.c +++ b/e-util/e-dialog-widgets.c @@ -1,23 +1,25 @@ -/* Evolution internal utilities - Glade dialog widget utilities - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Author: Federico Mena-Quintero +/* + * Evolution internal utilities - Glade dialog widget utilities * * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Federico Mena-Quintero + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * 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. */ #include diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h index 6277d0d83f..39f4b47b39 100644 --- a/e-util/e-dialog-widgets.h +++ b/e-util/e-dialog-widgets.h @@ -1,23 +1,25 @@ -/* Evolution internal utilities - Glade dialog widget utilities - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Author: Federico Mena-Quintero +/* + * Evolution internal utilities - Glade dialog widget utilities * * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Federico Mena-Quintero + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * 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. */ #ifndef E_DIALOG_WIDGETS_H diff --git a/e-util/e-error.h b/e-util/e-error.h index 0f4a5b2562..321957839f 100644 --- a/e-util/e-error.h +++ b/e-util/e-error.h @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Authors: Michael Zucchi + * 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 + * Lesser General Public License for more details. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Michael Zucchi * - * 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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-fsutils.h b/e-util/e-fsutils.h index cfa814ad18..91ad9b9c4a 100644 --- a/e-util/e-fsutils.h +++ b/e-util/e-fsutils.h @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- - * - * Authors: Michael Zucchi - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-gui-utils.h b/e-util/e-gui-utils.h index bbeefa9c61..d7552d5379 100644 --- a/e-util/e-gui-utils.h +++ b/e-util/e-gui-utils.h @@ -1,3 +1,24 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ + #ifndef E_GUI_UTILS_H #define E_GUI_UTILS_H diff --git a/e-util/e-html-utils.h b/e-util/e-html-utils.h index e0a6f4c711..fa70e55f7f 100644 --- a/e-util/e-html-utils.h +++ b/e-util/e-html-utils.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* e-html-utils.c */ /* - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Dan Winship - * - * This library 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Dan Winship + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ #ifndef __E_HTML_UTILS__ diff --git a/e-util/e-import.c b/e-util/e-import.c index da4fffb346..9e8c8a3fa7 100644 --- a/e-util/e-import.c +++ b/e-util/e-import.c @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Michael Zucchi + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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 + * Lesser General Public License for more details. * - * 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-logger.h b/e-util/e-logger.h index 1b2b0ba8da..f7dfd8017e 100644 --- a/e-util/e-logger.h +++ b/e-util/e-logger.h @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Authors: Srinivasa Ragavan + * 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 + * Lesser General Public License for more details. * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Srinivasa Ragavan * - * 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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-menu.c b/e-util/e-menu.c index ed5aaa7296..cfbb215712 100644 --- a/e-util/e-menu.c +++ b/e-util/e-menu.c @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Michael Zucchi + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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 + * Lesser General Public License for more details. * - * 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c index 6b651e37a5..80bce49cce 100644 --- a/e-util/e-mktemp.c +++ b/e-util/e-mktemp.c @@ -1,25 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Jeffrey Stedfast - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Jeffrey Stedfast + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * 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. */ - #ifdef HAVE_CONFIG_H #include #endif diff --git a/e-util/e-mktemp.h b/e-util/e-mktemp.h index 7378b7c04d..48e72235ee 100644 --- a/e-util/e-mktemp.h +++ b/e-util/e-mktemp.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Jeffrey Stedfast - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Jeffrey Stedfast + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * 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. */ diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c index 3feb542326..877d60ac41 100644 --- a/e-util/e-pilot-map.c +++ b/e-util/e-pilot-map.c @@ -1,23 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* Evolution Conduits - Pilot Map routines - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: JP Rosevear +/* + * Evolution Conduits - Pilot Map routines * * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * JP Rosevear + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * 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. */ #include diff --git a/e-util/e-pilot-map.h b/e-util/e-pilot-map.h index 3ceed5f885..d49d62cbb2 100644 --- a/e-util/e-pilot-map.h +++ b/e-util/e-pilot-map.h @@ -1,23 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* Evolution Conduits - Pilot Map routines - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: JP Rosevear +/* + * Evolution Conduits - Pilot Map routines * * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * JP Rosevear + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * 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. */ #ifndef E_PILOT_MAP_H diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c index f771929e26..2273064ac3 100644 --- a/e-util/e-pilot-util.c +++ b/e-util/e-pilot-util.c @@ -1,23 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* Evolution Conduits - Pilot Map routines - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: JP Rosevear +/* + * Evolution Conduits - Pilot Map routines * * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * JP Rosevear + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * 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. */ #include diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h index f315c25836..4994861d6f 100644 --- a/e-util/e-plugin.h +++ b/e-util/e-plugin.h @@ -1,3 +1,23 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ #ifndef _E_PLUGIN_H #define _E_PLUGIN_H diff --git a/e-util/e-popup.c b/e-util/e-popup.c index 1d2e808bc3..41428c3c5a 100644 --- a/e-util/e-popup.c +++ b/e-util/e-popup.c @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Michael Zucchi + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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 + * Lesser General Public License for more details. * - * 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-profile-event.c b/e-util/e-profile-event.c index eb3cef67ec..4fdd5d958a 100644 --- a/e-util/e-profile-event.c +++ b/e-util/e-profile-event.c @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Michael Zucchi + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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 + * Lesser General Public License for more details. * - * 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-request.c b/e-util/e-request.c index f384da9a59..1977b9b0fe 100644 --- a/e-util/e-request.c +++ b/e-util/e-request.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-request.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H diff --git a/e-util/e-request.h b/e-util/e-request.h index 96352e4a90..a84da2941a 100644 --- a/e-util/e-request.h +++ b/e-util/e-request.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-request.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef E_REQUEST_H diff --git a/e-util/e-sorter-array.h b/e-util/e-sorter-array.h index 23356da672..f31d9b06cc 100644 --- a/e-util/e-sorter-array.h +++ b/e-util/e-sorter-array.h @@ -1,24 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-sorter-array.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Authors: - * Chris Lahey + * 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 + * Lesser General Public License for more details. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * This library 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 - * Library General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _E_SORTER_ARRAY_H_ diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c index 1ac624bc6e..6176b58715 100644 --- a/e-util/e-sorter.c +++ b/e-util/e-sorter.c @@ -1,24 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-sorter.c - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Authors: - * Chris Lahey + * 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 + * Lesser General Public License for more details. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * This library 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 - * Library General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c index 52c3cf5b0c..60da48d375 100644 --- a/e-util/e-text-event-processor-emacs-like.c +++ b/e-util/e-text-event-processor-emacs-like.c @@ -1,24 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-text-event-processor-emacs-like.c - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Authors: - * Chris Lahey + * 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 + * Lesser General Public License for more details. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * This library 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 - * Library General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c index cec0d45f9b..e381e86342 100644 --- a/e-util/e-text-event-processor.c +++ b/e-util/e-text-event-processor.c @@ -1,24 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-text-event-processor.c - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Authors: - * Chris Lahey + * 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 + * Lesser General Public License for more details. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * This library 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 - * Library General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h index c894fda59d..1f88407823 100644 --- a/e-util/e-text-event-processor.h +++ b/e-util/e-text-event-processor.h @@ -1,24 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-text-event-processor.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Authors: - * Chris Lahey + * 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 + * Lesser General Public License for more details. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * This library 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 - * Library General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef __E_TEXT_EVENT_PROCESSOR_H__ diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c index 0850b92745..359157a25f 100644 --- a/e-util/e-util-labels.c +++ b/e-util/e-util-labels.c @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* e-util-labels.c +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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 + * Lesser General Public License for more details. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * This library 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 - * Library General Public License for more details. * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Authors: + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h index bc0df95b1b..59d11c63fe 100644 --- a/e-util/e-xml-utils.h +++ b/e-util/e-xml-utils.h @@ -1,24 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-xml-utils.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Authors: - * Chris Lahey + * 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 + * Lesser General Public License for more details. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * This library 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 - * Library General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef __E_XML_UTILS__ -- cgit v1.2.3 From 76dbf9df1f0126d695925c3c012387976951452d Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Thu, 4 Sep 2008 14:56:39 +0000 Subject: License changes. Changed license from GPL to LGPL. More to come. svn path=/trunk/; revision=36255 --- e-util/ChangeLog | 7 +++++++ e-util/e-gui-utils.c | 22 +++++++++++++++++----- e-util/e-html-utils.c | 28 +++++++++++++++------------- 3 files changed, 39 insertions(+), 18 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index c16355f7f6..520505af3a 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2008-09-04 Sankar P + +License Changes + + * e-gui-utils.c: + * e-html-utils.c: + 2008-09-02 Sankar P License Changes diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c index cff2b500b0..37d3fc9c48 100644 --- a/e-util/e-gui-utils.c +++ b/e-util/e-gui-utils.c @@ -1,16 +1,28 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * GUI utility functions * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * * Authors: - * Miguel de Icaza (miguel@ximian.com) - * Chris Toshok (toshok@ximian.com) + * Miguel de Icaza (miguel@ximian.com) + * Chris Toshok (toshok@ximian.com) * - * Copyright (C) 1999 Miguel de Icaza * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ - #ifdef HAVE_CONFIG_H #include #endif diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c index acec98998b..d634f5f6b0 100644 --- a/e-util/e-html-utils.c +++ b/e-util/e-html-utils.c @@ -1,21 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* e-html-utils.c - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Dan Winship - * - * This library 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Dan Winship + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ #include -- cgit v1.2.3 From b7fc5caefe4aded8d0ffd7088ecbbf1f370b995e Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Fri, 12 Sep 2008 16:19:36 +0000 Subject: License Changes from GPL to LGPL svn path=/trunk/; revision=36313 --- e-util/ChangeLog | 7 +++++++ e-util/e-dialog-utils.c | 27 +++++++++++++-------------- e-util/e-sorter-array.c | 31 +++++++++++++++---------------- 3 files changed, 35 insertions(+), 30 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 520505af3a..928f622e85 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2008-09-12 Sankar P + +License Changes + + * e-dialog-utils.c: + * e-sorter-array.c: + 2008-09-04 Sankar P License Changes diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index 2bb7bc7770..ecf9e7ec1e 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -1,25 +1,24 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-dialog-utils.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * 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. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. * * Authors: - * Michael Meeks - * Ettore Perazzoli + * Michael Meeks + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c index 503df30ca6..582ed959ad 100644 --- a/e-util/e-sorter-array.c +++ b/e-util/e-sorter-array.c @@ -1,24 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-sorter-array.c - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Authors: - * Chris Lahey + * 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 + * Lesser General Public License for more details. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * This library 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 - * Library General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include -- cgit v1.2.3 From 79d878670a311644f188f671cbc4e60193100558 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Tue, 16 Sep 2008 10:52:29 +0000 Subject: License changes from GPL to LGPL svn path=/trunk/; revision=36344 --- e-util/ChangeLog | 8 ++++++++ e-util/e-error.c | 27 ++++++++++++++------------- e-util/e-icon-factory.c | 28 ++++++++++++++-------------- e-util/e-plugin.c | 24 ++++++++++++------------ 4 files changed, 48 insertions(+), 39 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 928f622e85..40aa09e674 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,11 @@ +2008-09-16 Sankar P + +License Changes + + * e-error.c: + * e-icon-factory.c: + * e-plugin.c: + 2008-09-12 Sankar P License Changes diff --git a/e-util/e-error.c b/e-util/e-error.c index 14d94dc240..763a9ca540 100644 --- a/e-util/e-error.c +++ b/e-util/e-error.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Authors: Michael Zucchi + * 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 + * Lesser General Public License for more details. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Michael Zucchi * - * 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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index aa053001c5..d26717e9e0 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -1,22 +1,22 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ /* - * Authors: Jeffrey Stedfast + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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 + * Lesser General Public License for more details. * - * 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Jeffrey Stedfast + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index 85c1edb060..93ec47f3b6 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -1,19 +1,19 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * 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 free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * 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. + * 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 + * Lesser 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ #include -- cgit v1.2.3 From 762ac32d75dc9ad72e66969afda09766592fd42f Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Wed, 24 Sep 2008 11:02:48 +0000 Subject: Change License from GPL to LGPL svn path=/trunk/; revision=36443 --- e-util/ChangeLog | 6 ++++++ e-util/e-event.c | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 40aa09e674..04024ea454 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,9 @@ +2008-09-24 Sankar P + +License Changes + + * e-event.c: + 2008-09-16 Sankar P License Changes diff --git a/e-util/e-event.c b/e-util/e-event.c index f8d634feec..73111229f9 100644 --- a/e-util/e-event.c +++ b/e-util/e-event.c @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Michael Zucchi + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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 + * Lesser General Public License for more details. * - * 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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. + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ -- cgit v1.2.3 From 6df1e6d99608781b9e37b02e2a8c28074823ca7f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 26 Sep 2008 08:56:37 +0000 Subject: ** Fix for bug #535248 2008-09-26 Milan Crha ** Fix for bug #535248 * e-logger.c: (flush_logfile), (logger_set_component), (logger_finalize), (e_logger_log), (e_logger_get_logs): Check if log file has been opened successfully before using it. svn path=/trunk/; revision=36456 --- e-util/ChangeLog | 8 ++++++++ e-util/e-logger.c | 17 +++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 04024ea454..1afe42f512 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,11 @@ +2008-09-26 Milan Crha + + ** Fix for bug #535248 + + * e-logger.c: (flush_logfile), (logger_set_component), + (logger_finalize), (e_logger_log), (e_logger_get_logs): + Check if log file has been opened successfully before using it. + 2008-09-24 Sankar P License Changes diff --git a/e-util/e-logger.c b/e-util/e-logger.c index 0c95520fe8..9db0ca0e37 100644 --- a/e-util/e-logger.c +++ b/e-util/e-logger.c @@ -60,7 +60,8 @@ static gpointer parent_class; static gboolean flush_logfile (ELogger *logger) { - fflush (logger->priv->fp); + if (logger->priv->fp) + fflush (logger->priv->fp); logger->priv->timer = 0; return FALSE; @@ -81,6 +82,9 @@ logger_set_component (ELogger *logger, logger->priv->fp = g_fopen (logger->priv->logfile, "w"); logger->priv->timer = 0; + if (!logger->priv->fp) + g_warning ("%s: Failed to open log file '%s' for writing.", G_STRFUNC, logger->priv->logfile ? logger->priv->logfile : "[null]"); + g_free (temp); } @@ -126,7 +130,8 @@ logger_finalize (GObject *object) if (logger->priv->timer) g_source_remove (logger->priv->timer); flush_logfile (logger); - fclose (logger->priv->fp); + if (logger->priv->fp) + fclose (logger->priv->fp); g_free (logger->priv->component); g_free (logger->priv->logfile); @@ -230,6 +235,9 @@ e_logger_log (ELogger *logger, g_return_if_fail (primary != NULL); g_return_if_fail (secondary != NULL); + if (!logger->priv->fp) + return; + fprintf (logger->priv->fp, "%d:%ld:%s\n", level, t, primary); fprintf (logger->priv->fp, "%d:%ld:%s\n", level, t, secondary); set_dirty (logger); @@ -247,11 +255,12 @@ e_logger_get_logs (ELogger *logger, g_return_if_fail (func != NULL); /* Flush everything before we get the logs */ - fflush (logger->priv->fp); + if (logger->priv->fp) + fflush (logger->priv->fp); fp = g_fopen (logger->priv->logfile, "r"); if (!fp) { - fprintf (stderr, "Cannot open log file '%s' for reading! No flush yet?\n", logger->priv->logfile ? logger->priv->logfile : "[null]"); + g_warning ("%s: Cannot open log file '%s' for reading! No flush yet?\n", G_STRFUNC, logger->priv->logfile ? logger->priv->logfile : "[null]"); return; } -- cgit v1.2.3 From bfc8b8784d22d4eb4e7286cc6ef35dd5be5419a4 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Mon, 29 Sep 2008 08:36:04 +0000 Subject: License changes from GPL to LGPL svn path=/trunk/; revision=36465 --- e-util/ChangeLog | 8 ++++++++ e-util/e-util.c | 31 +++++++++++++++---------------- e-util/e-util.h | 31 +++++++++++++++---------------- e-util/e-xml-utils.c | 31 +++++++++++++++---------------- 4 files changed, 53 insertions(+), 48 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 1afe42f512..e85172b9ea 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,11 @@ +2008-09-29 Sankar P + +License Changes + + * e-util.c: + * e-util.h: + * e-xml-utils.c: + 2008-09-26 Milan Crha ** Fix for bug #535248 diff --git a/e-util/e-util.c b/e-util/e-util.c index 815f75e033..21f448b15b 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -1,24 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-util.c - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Authors: - * Chris Lahey + * 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 + * Lesser General Public License for more details. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * This library 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 - * Library General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include diff --git a/e-util/e-util.h b/e-util/e-util.h index 484ab59702..bb6f2ba5fc 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -1,24 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-util.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Authors: - * Chris Lahey + * 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 + * Lesser General Public License for more details. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * This library 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 - * Library General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _E_UTIL_H_ diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c index f0f5e83c86..653669b381 100644 --- a/e-util/e-xml-utils.c +++ b/e-util/e-xml-utils.c @@ -1,24 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-xml-utils.c - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Authors: - * Chris Lahey + * 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 + * Lesser General Public License for more details. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * This library 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 - * Library General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include -- cgit v1.2.3 From 77ff19dd8394167cdc9765af20a62bdaed18e308 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 1 Oct 2008 12:29:46 +0000 Subject: ** Fix for bug #554418 2008-10-01 Milan Crha ** Fix for bug #554418 * e-util/e-util.h: (e_util_guess_mime_type): * e-util/e-util.c: (e_util_guess_mime_type): Guess mime_type based on the file content only when permitted by the caller, otherwise check based on the filename only, where it fallbacks if file content guess fails. * mail/em-utils.c: (em_utils_snoop_type): * mail/em-popup.c: (emp_standard_menu_factory): Guess mime_type based on the filename only. * composer/e-msg-composer.c: (handle_uri), (e_msg_composer_add_inline_image_from_file): Guess mime_type based on the file content, if failed, then on the filename. * widgets/misc/e-attachment.c: (attachment_guess_mime_type): Allow guessing mime_type based on the file content. * calendar/gui/dialogs/comp-editor.c: (set_attachment_list): * calendar/gui/e-cal-popup.c: (ecalp_standard_menu_factory): Allow/disallow guessing of the mime_type based on the file content. svn path=/trunk/; revision=36529 --- e-util/ChangeLog | 10 ++++++++++ e-util/e-util.c | 50 ++++++++++++++++++++++++++++++++------------------ e-util/e-util.h | 2 +- 3 files changed, 43 insertions(+), 19 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index e85172b9ea..4c2e1d14d6 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,13 @@ +2008-10-01 Milan Crha + + ** Fix for bug #554418 + + * e-util.h: (e_util_guess_mime_type): + * e-util.c: (e_util_guess_mime_type): Guess mime_type based on + the file content only when permitted by the caller, otherwise + check based on the filename only, where it fallbacks if file + content guess fails. + 2008-09-29 Sankar P License Changes diff --git a/e-util/e-util.c b/e-util/e-util.c index 21f448b15b..97cd6265a6 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -1172,37 +1172,51 @@ e_file_lock_exists () /** * e_util_guess_mime_type: * @filename: it's a local file name, or URI. + * @localfile: set to TRUE if can check the local file content, FALSE to check only based on the filename itself. * Returns: NULL or newly allocated string with a mime_type of the given file. Free with g_free. * - * Guesses mime_type for the given file_name. + * Guesses mime_type for the given filename. **/ char * -e_util_guess_mime_type (const char *filename) +e_util_guess_mime_type (const char *filename, gboolean localfile) { - GFile *file; - GFileInfo *fi; - char *mime_type; + char *mime_type = NULL; g_return_val_if_fail (filename != NULL, NULL); - if (strstr (filename, "://")) - file = g_file_new_for_uri (filename); - else - file = g_file_new_for_path (filename); + if (localfile) { + GFile *file; - if (!file) - return NULL; + if (strstr (filename, "://")) + file = g_file_new_for_uri (filename); + else + file = g_file_new_for_path (filename); - fi = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, NULL); - if (!fi) { - g_object_unref (file); - return NULL; + if (file) { + GFileInfo *fi; + + fi = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, NULL); + if (fi) { + mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (fi)); + + g_object_unref (fi); + } + + g_object_unref (file); + } } - mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (fi)); + if (!mime_type) { + /* file doesn't exists locally, thus guess based on the filename */ + gboolean uncertain = FALSE; + gchar *content_type; - g_object_unref (fi); - g_object_unref (file); + content_type = g_content_type_guess (filename, NULL, 0, &uncertain); + if (content_type) { + mime_type = g_content_type_get_mime_type (content_type); + g_free (content_type); + } + } return mime_type; } diff --git a/e-util/e-util.h b/e-util/e-util.h index bb6f2ba5fc..78ec9e53c9 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -116,7 +116,7 @@ gboolean e_file_lock_create (void); void e_file_lock_destroy (void); gboolean e_file_lock_exists (void); -gchar * e_util_guess_mime_type (const gchar *filename); +gchar * e_util_guess_mime_type (const gchar *filename, gboolean localfile); gchar * e_util_filename_to_uri (const gchar *filename); gchar * e_util_uri_to_filename (const gchar *uri); -- cgit v1.2.3 From 994707897e322dbb2b6ce63637c122d8249602a9 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Mon, 6 Oct 2008 09:48:34 +0000 Subject: Remove obsolete functions. svn path=/trunk/; revision=36567 --- e-util/ChangeLog | 6 ++++++ e-util/e-util.c | 39 --------------------------------------- e-util/e-util.h | 1 - 3 files changed, 6 insertions(+), 40 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 4c2e1d14d6..00e2a0aac1 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,9 @@ +2008-10-06 Sankar P + + * widgets/table/e-cell-float.c: + * widgets/table/e-cell-float.h: + Remove obsolete function + 2008-10-01 Milan Crha ** Fix for bug #554418 diff --git a/e-util/e-util.c b/e-util/e-util.c index 97cd6265a6..2ce78ea0e2 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -420,45 +420,6 @@ do_format_number_as_float (gdouble number) } } -gchar * -e_format_number_float (gfloat number) -{ - gfloat int_part; - gint fraction; - struct lconv *locality; - gchar *str_intpart; - gchar *decimal_point; - gchar *str_fraction; - gchar *value; - - locality = localeconv(); - - int_part = floor (number); - str_intpart = do_format_number_as_float ((gdouble) int_part); - - if (!strcmp(locality->mon_decimal_point, "")) { - decimal_point = "."; - } - else { - decimal_point = locality->mon_decimal_point; - } - - fraction = (gint) ((number - int_part) * 100); - - if (fraction == 0) { - str_fraction = g_strdup ("00"); - } else { - str_fraction = g_strdup_printf ("%02d", fraction); - } - - value = g_strconcat (str_intpart, decimal_point, str_fraction, NULL); - - g_free (str_intpart); - g_free (str_fraction); - - return value; -} - /* Perform a binary search for key in base which has nmemb elements of size bytes each. The comparisons are done by (*compare)(). */ void diff --git a/e-util/e-util.h b/e-util/e-util.h index 78ec9e53c9..b6ff33429d 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -59,7 +59,6 @@ gboolean e_write_file_uri (const gchar *filename, /* This only makes a filename safe for usage as a filename. * It still may have shell meta-characters in it. */ gchar * e_format_number (gint number); -gchar * e_format_number_float (gfloat number); typedef gint (*ESortCompareFunc) (gconstpointer first, gconstpointer second, -- cgit v1.2.3 From df55bc8beb19cd22518833f3137611075a290fb6 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Wed, 29 Oct 2008 10:44:21 +0000 Subject: License Changes svn path=/trunk/; revision=36693 --- e-util/ChangeLog | 7 +++++++ e-util/e-plugin-ui.c | 18 ++++++++---------- e-util/e-plugin-ui.h | 18 ++++++++---------- 3 files changed, 23 insertions(+), 20 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 00e2a0aac1..d0e948fd25 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2008-10-29 Sankar P + +License Changes + + * e-plugin-ui.c: + * e-plugin-ui.h: + 2008-10-06 Sankar P * widgets/table/e-cell-float.c: diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c index 467b71628c..0b28adda5d 100644 --- a/e-util/e-plugin-ui.c +++ b/e-util/e-plugin-ui.c @@ -1,20 +1,18 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU Lesser General Public - * License as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * License along with the program; if not, see + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ #include "e-plugin-ui.h" diff --git a/e-util/e-plugin-ui.h b/e-util/e-plugin-ui.h index ea41eb67b7..00e6ed5fcf 100644 --- a/e-util/e-plugin-ui.h +++ b/e-util/e-plugin-ui.h @@ -1,20 +1,18 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU Lesser General Public - * License as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * 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. + * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * License along with the program; if not, see + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ #ifndef E_PLUGIN_UI_H -- cgit v1.2.3 From 585ed6226b62b7fe152557c81d8f8332de97be69 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 30 Oct 2008 16:52:23 +0000 Subject: Only include the toplevel GTK+ header. 2008-10-30 Matthew Barnes * addressbook/gui/contact-editor/test-editor.c: * addressbook/gui/widgets/e-minicard-label.c: * addressbook/gui/widgets/e-minicard-view-widget.c: * addressbook/gui/widgets/test-reflow.c: * calendar/gui/control-factory.c: * calendar/gui/e-calendar-table.c: * calendar/gui/e-week-view-event-item.c: * calendar/gui/weekday-picker.c: * e-util/e-icon-factory.c: * shell/importer/evolution-importer-client.h: * shell/importer/intelligent.c: * shell/test/evolution-test-component.c: * widgets/menus/gal-view-menus.c: * widgets/misc/e-activity-handler.c: * widgets/table/e-table-config-field.h: Only include the toplevel GTK+ header. svn path=/trunk/; revision=36699 --- e-util/ChangeLog | 5 +++++ e-util/e-icon-factory.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index d0e948fd25..3cc045e114 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,8 @@ +2008-10-30 Matthew Barnes + + * e-icon-factory.c: + Only include the toplevel GTK+ header. + 2008-10-29 Sankar P License Changes diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index d26717e9e0..7e9cf4cad7 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -34,7 +34,7 @@ #include #endif -#include +#include #include "e-icon-factory.h" #include "e-util-private.h" -- cgit v1.2.3 From 71b380658b14b5511dc5008a4eda649c97a6cfae Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 2 Nov 2008 14:16:17 +0000 Subject: Remove this unused internal function. 2008-11-02 Matthew Barnes * e-util.c (do_format_number_as_float): Remove this unused internal function. svn path=/trunk/; revision=36713 --- e-util/ChangeLog | 5 ++++ e-util/e-util.c | 88 -------------------------------------------------------- 2 files changed, 5 insertions(+), 88 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 3cc045e114..d53074fdcd 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,8 @@ +2008-11-02 Matthew Barnes + + * e-util.c (do_format_number_as_float): + Remove this unused internal function. + 2008-10-30 Matthew Barnes * e-icon-factory.c: diff --git a/e-util/e-util.c b/e-util/e-util.c index 2ce78ea0e2..f05c9d907a 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -332,94 +332,6 @@ e_format_number (gint number) } } -static gchar * -do_format_number_as_float (gdouble number) -{ - GList *iterator, *list = NULL; - struct lconv *locality; - gint char_length = 0; - gint group_count = 0; - gchar *grouping; - gint last_count = 3; - gint divider; - gchar *value; - gchar *value_iterator; - gdouble fractional; - - locality = localeconv(); - grouping = locality->grouping; - while (number >= 1.0) { - gchar *group; - switch (*grouping) { - default: - last_count = *grouping; - grouping++; - /* Fall through */ - case 0: - divider = epow10(last_count); - number /= divider; - fractional = modf (number, &number); - fractional *= divider; - fractional = floor (fractional); - - if (number >= 1.0) { - group = g_strdup_printf("%0*d", last_count, (int) fractional); - } else { - group = g_strdup_printf("%d", (gint) fractional); - } - break; - case CHAR_MAX: - divider = epow10(last_count); - number /= divider; - fractional = modf (number, &number); - fractional *= divider; - fractional = floor (fractional); - - while (number >= 1.0) { - group = g_strdup_printf("%0*d", last_count, (gint) fractional); - - char_length += strlen(group); - list = g_list_prepend(list, group); - group_count ++; - - divider = epow10(last_count); - number /= divider; - fractional = modf (number, &number); - fractional *= divider; - fractional = floor (fractional); - } - - group = g_strdup_printf("%d", (gint) fractional); - break; - } - char_length += strlen(group); - list = g_list_prepend(list, group); - group_count ++; - } - - if (list) { - value = g_new(gchar, 1 + char_length + (group_count - 1) * strlen(locality->thousands_sep)); - - iterator = list; - value_iterator = value; - - strcpy(value_iterator, iterator->data); - value_iterator += strlen(iterator->data); - for (iterator = iterator->next; iterator; iterator = iterator->next) { - strcpy(value_iterator, locality->thousands_sep); - value_iterator += strlen(locality->thousands_sep); - - strcpy(value_iterator, iterator->data); - value_iterator += strlen(iterator->data); - } - g_list_foreach (list, (GFunc) g_free, NULL); - g_list_free (list); - return value; - } else { - return g_strdup("0"); - } -} - /* Perform a binary search for key in base which has nmemb elements of size bytes each. The comparisons are done by (*compare)(). */ void -- cgit v1.2.3 From 26fe8fb76ea445c87fd72997f97e7c4950b53bd1 Mon Sep 17 00:00:00 2001 From: Ashish Shrivastava Date: Mon, 3 Nov 2008 12:10:48 +0000 Subject: ** Fix for bug #559086 2008-11-03 Ashish Shrivastava ** Fix for bug #559086 * Most of the calendar errors are now non-intrusive * calendar.error.xml: Added a new error message for non-intrusive backend_died. * apps_evolution_calendar.schemas.in: * calendar-commands.c: Added new verb for help debug message (help_debug): * gnome-cal.c: Support for non-intrusive error. (client_cal_opened_cb), Define fash table and accessing errors: * e-calendar-view.c: (error_response): (e_calendar_utils_show_error_silent), (e_calendar_utils_show_info_silent): * e-calendar-view.h: * calendar-component.c: Added EActivityHandler and ELogger: (calendar_component_peek_activity_handler), (calendar_component_show_logger): * calendar-component.h: svn path=/trunk/; revision=36727 --- e-util/ChangeLog | 7 +++++++ e-util/Makefile.am | 2 ++ 2 files changed, 9 insertions(+) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index d53074fdcd..964eb6b298 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -68,6 +68,13 @@ License Changes * e-dialog-utils.c: * e-sorter-array.c: +2008-11-03 Ashish Shrivastava + + ** Support for Non-intrusive error in calendar. + + * Makefile.am: Added new files: + * e-non-intrusive-error-dialog.c, e-non-intrusive-error-dialog.h: + 2008-09-04 Sankar P License Changes diff --git a/e-util/Makefile.am b/e-util/Makefile.am index f22d8e6161..f003ff9068 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -57,6 +57,7 @@ eutilinclude_HEADERS = \ e-icon-factory.h \ e-import.h \ e-logger.h \ + e-non-intrusive-error-dialog.h \ e-menu.h \ e-mktemp.h \ e-print.h \ @@ -98,6 +99,7 @@ libeutil_la_SOURCES = \ e-icon-factory.c \ e-import.c \ e-logger.c \ + e-non-intrusive-error-dialog.c \ e-menu.c \ e-mktemp.c \ e-plugin.c \ -- cgit v1.2.3 From 51aea6d98e9771c7b9c3743054e27cf17b2c4ab5 Mon Sep 17 00:00:00 2001 From: Akhil Laddha Date: Tue, 4 Nov 2008 04:44:03 +0000 Subject: Missed commiting these files in the previous commit. 2008-11-04 Akhil Laddha * e-non-intrusive-error-dialog.c (eni_query_tooltip_cb), (eni_render_pixbuf), (eni_render_date), (eni_append_logs), (eni_config_get_error_level), (eni_config_get_error_timeout), (eni_error_timeout_changed), (eni_error_level_value_changed), (eni_show_logger): * e-non-intrusive-error-dialog.h: Missed commiting these files in the previous commit. svn path=/trunk/; revision=36735 --- e-util/ChangeLog | 24 ++- e-util/e-non-intrusive-error-dialog.c | 306 ++++++++++++++++++++++++++++++++++ e-util/e-non-intrusive-error-dialog.h | 68 ++++++++ 3 files changed, 391 insertions(+), 7 deletions(-) create mode 100644 e-util/e-non-intrusive-error-dialog.c create mode 100644 e-util/e-non-intrusive-error-dialog.h (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 964eb6b298..769f064e71 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,20 @@ +2008-11-04 Akhil Laddha + + * e-non-intrusive-error-dialog.c (eni_query_tooltip_cb), + (eni_render_pixbuf), (eni_render_date), (eni_append_logs), + (eni_config_get_error_level), (eni_config_get_error_timeout), + (eni_error_timeout_changed), (eni_error_level_value_changed), + (eni_show_logger): + * e-non-intrusive-error-dialog.h: + Missed commiting these files in the previous commit. + +2008-11-03 Ashish Shrivastava + + ** Support for Non-intrusive error in calendar. + + * Makefile.am: Added new files: + * e-non-intrusive-error-dialog.c, e-non-intrusive-error-dialog.h: + 2008-11-02 Matthew Barnes * e-util.c (do_format_number_as_float): @@ -68,13 +85,6 @@ License Changes * e-dialog-utils.c: * e-sorter-array.c: -2008-11-03 Ashish Shrivastava - - ** Support for Non-intrusive error in calendar. - - * Makefile.am: Added new files: - * e-non-intrusive-error-dialog.c, e-non-intrusive-error-dialog.h: - 2008-09-04 Sankar P License Changes diff --git a/e-util/e-non-intrusive-error-dialog.c b/e-util/e-non-intrusive-error-dialog.c new file mode 100644 index 0000000000..9e39e43ff8 --- /dev/null +++ b/e-util/e-non-intrusive-error-dialog.c @@ -0,0 +1,306 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Authors: Ashish Shrivastava + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include +#include +#include +#include +#include "e-non-intrusive-error-dialog.h" + +/* eni - non intrusive error */ + +static gboolean +eni_query_tooltip_cb (GtkTreeView *view, + gint x, + gint y, + gboolean keyboard_mode, + GtkTooltip *tooltip) +{ + GtkTreeViewColumn *column; + GtkTreeModel *model; + GtkTreePath *path; + GtkTreeIter iter; + gint level; + + if (!gtk_tree_view_get_tooltip_context ( + view, &x, &y, keyboard_mode, NULL, &path, &iter)) + return FALSE; + + /* Figure out which column we're pointing at. */ + if (keyboard_mode) + gtk_tree_view_get_cursor (view, NULL, &column); + else + gtk_tree_view_get_path_at_pos ( + view, x, y, NULL, &column, NULL, NULL); + + /* Restrict the tip area to a single cell. */ + gtk_tree_view_set_tooltip_cell (view, tooltip, path, column, NULL); + + /* This only works if the tree view is NOT reorderable. */ + if (column != gtk_tree_view_get_column (view, 0)) + return FALSE; + + model = gtk_tree_view_get_model (view); + gtk_tree_model_get (model, &iter, COL_LEVEL, &level, -1); + gtk_tooltip_set_text (tooltip, ldata[level].key); + + return TRUE; +} + +static void +eni_render_pixbuf (GtkTreeViewColumn *column, GtkCellRenderer *renderer, + GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) +{ + gint level; + + gtk_tree_model_get (model, iter, COL_LEVEL, &level, -1); + g_object_set ( + renderer, "stock-id", ldata[level].stock_id, + "stock-size", GTK_ICON_SIZE_MENU, NULL); +} + +static void +eni_render_date (GtkTreeViewColumn *column, GtkCellRenderer *renderer, + GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) +{ + time_t t; + char sdt[100]; /* Should be sufficient? */ + + gtk_tree_model_get (model, iter, COL_TIME, &t, -1); + strftime (sdt, 100, "%x %X", localtime (&t)); + g_object_set (renderer, "text", sdt, NULL); +} + +static void +eni_append_logs (const char *txt, GtkListStore *store) +{ + char **str; + + str = g_strsplit (txt, ":", 3); + if (str[0] && str[1] && str[2]) { + GtkTreeIter iter; + + gtk_list_store_append (store, &iter); + gtk_list_store_set ( + store, &iter, + COL_LEVEL, atoi (str[0]), + COL_TIME, atol (str[1]), + COL_DATA, g_strstrip (str[2]), + -1); + } else + g_printerr ("Unable to decode error log: %s\n", txt); + + g_strfreev (str); +} + +static guint +eni_config_get_error_level (const char *path) +{ + GConfClient *gconf_client; + guint error_level; + + gconf_client = gconf_client_get_default (); + error_level = gconf_client_get_int (gconf_client, path, NULL); + + g_object_unref (gconf_client); + return error_level; +} + +guint +eni_config_get_error_timeout (const char *path) +{ + GConfClient *gconf_client; + guint error_time; + + gconf_client = gconf_client_get_default (); + error_time = gconf_client_get_int (gconf_client, path, NULL); + + g_object_unref (gconf_client); + return error_time; +} + +static void +eni_error_timeout_changed (GtkSpinButton *b, void *data) +{ + GConfClient *gconf_client; + int value = gtk_spin_button_get_value_as_int (b); + + gconf_client = gconf_client_get_default (); + + gconf_client_set_int (gconf_client, (char *) data, value, NULL); + g_object_unref (gconf_client); +} + +static void +eni_error_level_value_changed (GtkComboBox *w, gpointer *data) +{ + GConfClient *gconf_client; + int value = gtk_combo_box_get_active (w); + + gconf_client = gconf_client_get_default (); + + gconf_client_set_int (gconf_client, (char *) data, value, NULL); + + g_object_unref (gconf_client); +} + +void +eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, const char *error_level_path) +{ + GtkWidget *container; + GtkWidget *label; + GtkWidget *toplevel; + GtkWidget *vbox; + GtkWidget *widget; + GtkWidget *window; + GtkListStore *store; + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + int i; + + toplevel = gtk_widget_get_toplevel (top); + + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_default_size (GTK_WINDOW (window), 500, 400); + gtk_window_set_title (GTK_WINDOW (window), _("Debug Logs")); + gtk_window_set_transient_for ( + GTK_WINDOW (window), GTK_WINDOW (toplevel)); + gtk_container_set_border_width (GTK_CONTAINER (window), 12); + + vbox = gtk_vbox_new (FALSE, 12); + gtk_container_add (GTK_CONTAINER (window), vbox); + + container = gtk_hbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (vbox), container, FALSE, FALSE, 0); + + /* Translators: This is the first part of the sentence + * "Show _errors in the status bar for" - XXX - "second(s)." */ + widget = gtk_label_new_with_mnemonic ( + _("Show _errors in the status bar for")); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + label = widget; + + widget = gtk_spin_button_new_with_range (1.0, 60.0, 1.0); + gtk_spin_button_set_value ( + GTK_SPIN_BUTTON (widget), + (gdouble) eni_config_get_error_timeout (error_timeout_path)); + g_signal_connect ( + widget, "value-changed", + G_CALLBACK (eni_error_timeout_changed), error_timeout_path); + + gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + + /* Translators: This is the second part of the sentence + * "Show _errors in the status bar for" - XXX - "second(s)." */ + widget = gtk_label_new_with_mnemonic (_("second(s).")); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + + container = gtk_hbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (vbox), container, FALSE, FALSE, 0); + + widget = gtk_label_new_with_mnemonic (_("Log Messages:")); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + label = widget; + + widget = gtk_combo_box_new_text (); + for (i = E_LOG_ERROR; i <= E_LOG_DEBUG; i++) + gtk_combo_box_append_text ( + GTK_COMBO_BOX (widget), ldata[i].text); + gtk_combo_box_set_active ((GtkComboBox *) widget, eni_config_get_error_level(error_level_path)); + + g_signal_connect ( + widget, "changed", + G_CALLBACK (eni_error_level_value_changed), error_level_path); + + gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + + store = gtk_list_store_new (3, G_TYPE_INT, G_TYPE_LONG, G_TYPE_STRING); + e_logger_get_logs (logger, (ELogFunction) eni_append_logs, store); + gtk_tree_sortable_set_sort_column_id ( + GTK_TREE_SORTABLE (store), COL_TIME, GTK_SORT_DESCENDING); + + container = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy ( + GTK_SCROLLED_WINDOW (container), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type ( + GTK_SCROLLED_WINDOW (container), GTK_SHADOW_IN); + gtk_box_pack_start (GTK_BOX (vbox), container, TRUE, TRUE, 0); + + widget = gtk_tree_view_new(); + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (widget), TRUE); + gtk_tree_view_set_reorderable (GTK_TREE_VIEW (widget), FALSE); + gtk_tree_view_set_model (GTK_TREE_VIEW (widget), GTK_TREE_MODEL (store)); + gtk_tree_view_set_search_column (GTK_TREE_VIEW (widget), COL_DATA); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (widget), TRUE); + gtk_widget_set_has_tooltip (widget, TRUE); + gtk_container_add (GTK_CONTAINER (container), widget); + + g_signal_connect ( + widget, "query-tooltip", + G_CALLBACK (eni_query_tooltip_cb), NULL); + + column = gtk_tree_view_column_new (); + gtk_tree_view_column_set_title (column, _("Log Level")); + gtk_tree_view_append_column (GTK_TREE_VIEW (widget), column); + renderer = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer, TRUE); + gtk_tree_view_column_set_cell_data_func ( + column, renderer, eni_render_pixbuf, NULL, NULL); + + column = gtk_tree_view_column_new (); + gtk_tree_view_column_set_title (column, _("Time")); + gtk_tree_view_append_column (GTK_TREE_VIEW (widget), column); + + renderer = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer, FALSE); + gtk_tree_view_column_set_cell_data_func ( + column, renderer, eni_render_date, NULL, NULL); + + renderer = gtk_cell_renderer_text_new (); + gtk_tree_view_insert_column_with_attributes( + GTK_TREE_VIEW (widget), -1, _("Messages"), + renderer, "markup", COL_DATA, NULL); + + container = gtk_hbutton_box_new (); + gtk_button_box_set_layout ( + GTK_BUTTON_BOX (container), GTK_BUTTONBOX_END); + gtk_box_pack_start (GTK_BOX (vbox), container, FALSE, FALSE, 0); + + widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE); + gtk_widget_set_tooltip_text (widget, _("Close this window")); + g_signal_connect_swapped ( + widget, "clicked", + G_CALLBACK (gtk_widget_destroy), window); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + + gtk_widget_show_all (window); +} + diff --git a/e-util/e-non-intrusive-error-dialog.h b/e-util/e-non-intrusive-error-dialog.h new file mode 100644 index 0000000000..5b86f6754f --- /dev/null +++ b/e-util/e-non-intrusive-error-dialog.h @@ -0,0 +1,68 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Authors: Ashish Shrivastava + * + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef __E_ERROR_DIALOG_H__ +#define __E_ERROR_DIALOG_H__ + +#include +#include "e-error.h" +#include "e-icon-factory.h" +#include "e-logger.h" +#include "e-util/gconf-bridge.h" + +G_BEGIN_DECLS + +struct _log_data { + int level; + char *key; + char *text; + char *stock_id; + GdkPixbuf *pbuf; +} ldata [] = { + { E_LOG_ERROR, N_("Error"), N_("Errors"), GTK_STOCK_DIALOG_ERROR }, + { E_LOG_WARNINGS, N_("Warning"), N_("Warnings and Errors"), GTK_STOCK_DIALOG_WARNING }, + { E_LOG_DEBUG, N_("Debug"), N_("Error, Warnings and Debug messages"), GTK_STOCK_DIALOG_INFO } +}; + +enum +{ + COL_LEVEL = 0, + COL_TIME, + COL_DATA +}; + +/* eni - error non intrusive*/ +static gboolean eni_query_tooltip_cb (GtkTreeView *view,gint x,gint y,gboolean keyboard_mode,GtkTooltip *tooltip); + +static void eni_render_pixbuf (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data); + +static void eni_render_date (GtkTreeViewColumn *column, GtkCellRenderer *renderer,GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data); + +static void eni_append_logs (const char *txt, GtkListStore *store); +static void eni_error_timeout_changed (GtkSpinButton *b, void *data); +static void eni_error_level_value_changed (GtkComboBox *w, gpointer *data); +static guint eni_config_get_error_level (const char *path); +guint eni_config_get_error_timeout (const char *path); +void eni_show_logger(ELogger *logger, GtkWidget *widget, const char *error_timeout_path, const char *error_level_path); + +G_END_DECLS + +#endif /* __E_ERROR_DIALOG_H__ */ -- cgit v1.2.3 From 4e7597a4a2732baeeda9dd4876a873ec6588d6f7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 4 Nov 2008 13:27:22 +0000 Subject: Fix compiler warnings. 2008-11-04 Matthew Barnes * calendar/gui/calendar-commands.c: * calendar/gui/calendar-component.h: * calendar/gui/gnome-cal.c: * e-util/e-non-intrusive-error-dialog.c: * e-util/e-non-intrusive-error-dialog.h: Fix compiler warnings. svn path=/trunk/; revision=36738 --- e-util/ChangeLog | 6 +++++ e-util/e-non-intrusive-error-dialog.c | 44 ++++++++++++++++++----------------- e-util/e-non-intrusive-error-dialog.h | 17 ++++---------- 3 files changed, 34 insertions(+), 33 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 769f064e71..6caf6c2b8b 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,9 @@ +2008-11-04 Matthew Barnes + + * e-non-intrusive-error-dialog.c: + * e-non-intrusive-error-dialog.h: + Fix compiler warnings. + 2008-11-04 Akhil Laddha * e-non-intrusive-error-dialog.c (eni_query_tooltip_cb), diff --git a/e-util/e-non-intrusive-error-dialog.c b/e-util/e-non-intrusive-error-dialog.c index 9e39e43ff8..070c1e9bef 100644 --- a/e-util/e-non-intrusive-error-dialog.c +++ b/e-util/e-non-intrusive-error-dialog.c @@ -189,7 +189,7 @@ eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, gtk_window_set_default_size (GTK_WINDOW (window), 500, 400); gtk_window_set_title (GTK_WINDOW (window), _("Debug Logs")); gtk_window_set_transient_for ( - GTK_WINDOW (window), GTK_WINDOW (toplevel)); + GTK_WINDOW (window), GTK_WINDOW (toplevel)); gtk_container_set_border_width (GTK_CONTAINER (window), 12); vbox = gtk_vbox_new (FALSE, 12); @@ -201,17 +201,18 @@ eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, /* Translators: This is the first part of the sentence * "Show _errors in the status bar for" - XXX - "second(s)." */ widget = gtk_label_new_with_mnemonic ( - _("Show _errors in the status bar for")); + _("Show _errors in the status bar for")); gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); label = widget; widget = gtk_spin_button_new_with_range (1.0, 60.0, 1.0); gtk_spin_button_set_value ( - GTK_SPIN_BUTTON (widget), - (gdouble) eni_config_get_error_timeout (error_timeout_path)); + GTK_SPIN_BUTTON (widget), + (gdouble) eni_config_get_error_timeout (error_timeout_path)); g_signal_connect ( - widget, "value-changed", - G_CALLBACK (eni_error_timeout_changed), error_timeout_path); + widget, "value-changed", + G_CALLBACK (eni_error_timeout_changed), + (gpointer) error_timeout_path); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); @@ -235,8 +236,9 @@ eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, gtk_combo_box_set_active ((GtkComboBox *) widget, eni_config_get_error_level(error_level_path)); g_signal_connect ( - widget, "changed", - G_CALLBACK (eni_error_level_value_changed), error_level_path); + widget, "changed", + G_CALLBACK (eni_error_level_value_changed), + (gpointer) error_level_path); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); @@ -244,14 +246,14 @@ eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, store = gtk_list_store_new (3, G_TYPE_INT, G_TYPE_LONG, G_TYPE_STRING); e_logger_get_logs (logger, (ELogFunction) eni_append_logs, store); gtk_tree_sortable_set_sort_column_id ( - GTK_TREE_SORTABLE (store), COL_TIME, GTK_SORT_DESCENDING); + GTK_TREE_SORTABLE (store), COL_TIME, GTK_SORT_DESCENDING); container = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy ( - GTK_SCROLLED_WINDOW (container), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + GTK_SCROLLED_WINDOW (container), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type ( - GTK_SCROLLED_WINDOW (container), GTK_SHADOW_IN); + GTK_SCROLLED_WINDOW (container), GTK_SHADOW_IN); gtk_box_pack_start (GTK_BOX (vbox), container, TRUE, TRUE, 0); widget = gtk_tree_view_new(); @@ -264,8 +266,8 @@ eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, gtk_container_add (GTK_CONTAINER (container), widget); g_signal_connect ( - widget, "query-tooltip", - G_CALLBACK (eni_query_tooltip_cb), NULL); + widget, "query-tooltip", + G_CALLBACK (eni_query_tooltip_cb), NULL); column = gtk_tree_view_column_new (); gtk_tree_view_column_set_title (column, _("Log Level")); @@ -273,7 +275,7 @@ eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, renderer = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer, TRUE); gtk_tree_view_column_set_cell_data_func ( - column, renderer, eni_render_pixbuf, NULL, NULL); + column, renderer, eni_render_pixbuf, NULL, NULL); column = gtk_tree_view_column_new (); gtk_tree_view_column_set_title (column, _("Time")); @@ -282,23 +284,23 @@ eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, renderer = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, renderer, FALSE); gtk_tree_view_column_set_cell_data_func ( - column, renderer, eni_render_date, NULL, NULL); + column, renderer, eni_render_date, NULL, NULL); renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes( - GTK_TREE_VIEW (widget), -1, _("Messages"), - renderer, "markup", COL_DATA, NULL); + GTK_TREE_VIEW (widget), -1, _("Messages"), + renderer, "markup", COL_DATA, NULL); container = gtk_hbutton_box_new (); gtk_button_box_set_layout ( - GTK_BUTTON_BOX (container), GTK_BUTTONBOX_END); + GTK_BUTTON_BOX (container), GTK_BUTTONBOX_END); gtk_box_pack_start (GTK_BOX (vbox), container, FALSE, FALSE, 0); widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE); gtk_widget_set_tooltip_text (widget, _("Close this window")); g_signal_connect_swapped ( - widget, "clicked", - G_CALLBACK (gtk_widget_destroy), window); + widget, "clicked", + G_CALLBACK (gtk_widget_destroy), window); gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); gtk_widget_show_all (window); diff --git a/e-util/e-non-intrusive-error-dialog.h b/e-util/e-non-intrusive-error-dialog.h index 5b86f6754f..e801d47a52 100644 --- a/e-util/e-non-intrusive-error-dialog.h +++ b/e-util/e-non-intrusive-error-dialog.h @@ -50,18 +50,11 @@ enum }; /* eni - error non intrusive*/ -static gboolean eni_query_tooltip_cb (GtkTreeView *view,gint x,gint y,gboolean keyboard_mode,GtkTooltip *tooltip); - -static void eni_render_pixbuf (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data); - -static void eni_render_date (GtkTreeViewColumn *column, GtkCellRenderer *renderer,GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data); - -static void eni_append_logs (const char *txt, GtkListStore *store); -static void eni_error_timeout_changed (GtkSpinButton *b, void *data); -static void eni_error_level_value_changed (GtkComboBox *w, gpointer *data); -static guint eni_config_get_error_level (const char *path); -guint eni_config_get_error_timeout (const char *path); -void eni_show_logger(ELogger *logger, GtkWidget *widget, const char *error_timeout_path, const char *error_level_path); +guint eni_config_get_error_timeout (const char *path); +void eni_show_logger (ELogger *logger, + GtkWidget *widget, + const char *error_timeout_path, + const char *error_level_path); G_END_DECLS -- cgit v1.2.3 From 8ef97f1b13849dc22c24b76e17cbfb8d23d7aa70 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 12 Nov 2008 19:00:42 +0000 Subject: ** Fix for bug #559810 2008-11-12 Milan Crha ** Fix for bug #559810 * e-util-labels.c: (e_util_labels_parse): Do not localize empty label names, also localize them only first time. svn path=/trunk/; revision=36777 --- e-util/ChangeLog | 7 +++++++ e-util/e-util-labels.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 6caf6c2b8b..461861d7c3 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2008-11-12 Milan Crha + + ** Fix for bug #559810 + + * e-util-labels.c: (e_util_labels_parse): + Do not localize empty label names, also localize them only first time. + 2008-11-04 Matthew Barnes * e-non-intrusive-error-dialog.c: diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c index 359157a25f..da32f233c5 100644 --- a/e-util/e-util-labels.c +++ b/e-util/e-util-labels.c @@ -79,7 +79,7 @@ e_util_labels_parse (GConfClient *client) /* Needed for Backward Compatibility */ if (num < LABEL_DEFAULTS_NUM) { - label->name = g_strdup (_(buf)); + label->name = g_strdup ((buf && *buf) ? buf : _(label_defaults[num].name)); label->tag = g_strdup (label_defaults[num].tag); num++; } else if (!tag) { -- cgit v1.2.3 From a75b727efee43acf8e4975b264a85ea743529526 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 27 Nov 2008 12:59:25 +0000 Subject: ** Fix for bug #332729 2008-11-27 Milan Crha ** Fix for bug #332729 * e-config.c: (ep_finalise): Disconnect handlers on the widget before freeing the structure it is using. svn path=/trunk/; revision=36816 --- e-util/ChangeLog | 7 +++++++ e-util/e-config.c | 4 ++++ 2 files changed, 11 insertions(+) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 461861d7c3..d9701d49b3 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2008-11-27 Milan Crha + + ** Fix for bug #332729 + + * e-config.c: (ep_finalise): Disconnect handlers on the widget before + freeing the structure it is using. + 2008-11-12 Milan Crha ** Fix for bug #559810 diff --git a/e-util/e-config.c b/e-util/e-config.c index d320bcd7af..03a553feb2 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -122,6 +122,10 @@ ep_finalise(GObject *o) } while ( (wn = (struct _widget_node *)e_dlist_remhead(&p->widgets)) ) { + /* disconnect the gtk_widget_destroyed function from the widget */ + if (wn->widget) + g_signal_handlers_disconnect_matched (wn->widget, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, &wn->widget); + g_free(wn); } -- cgit v1.2.3 From 7b221ebc07a7867c3528b113e82f25a01816a015 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 5 Dec 2008 19:20:28 +0000 Subject: ** Fix for bug #332629 2008-12-05 Milan Crha ** Fix for bug #332629 * filter/filter-option.h: (struct _filter_option), (struct _FilterOption), (filter_option_add): * filter/filter-option.c: (filter_option_init), (filter_option_finalise), (filter_option_add), (xml_create), (get_widget), (clone): Be able to define optionlist with dynamically created list of options. * filter/filter-label.c: (fill_options): Adapt. * addressbook/gui/widgets/addresstypes.xml: * calendar/gui/caltypes.xml: * calendar/gui/memotypes.xml: * calendar/gui/tasktypes.xml: Use dynamically created list of categories in the option's widget. svn path=/trunk/; revision=36836 --- e-util/ChangeLog | 8 ++++++++ e-util/e-util.c | 22 ++++++++++++++++++++++ e-util/e-util.h | 2 ++ 3 files changed, 32 insertions(+) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index d9701d49b3..18ab054e84 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,11 @@ +2008-12-05 Milan Crha + + ** Part of fix for bug #332629 + + * e-util.h: (e_util_get_category_filter_options): + * e-util.c: (e_util_get_category_filter_options): + New helper function to be used in FilterOption. + 2008-11-27 Milan Crha ** Fix for bug #332729 diff --git a/e-util/e-util.c b/e-util/e-util.c index f05c9d907a..215a494df9 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -46,6 +46,8 @@ #endif #include +#include +#include "filter/filter-option.h" #include "e-util.h" #include "e-util-private.h" @@ -1224,3 +1226,23 @@ e_util_read_file (const char *filename, gboolean filename_is_uri, char **buffer, return res; } +GSList * +e_util_get_category_filter_options (void) +{ + GSList *res = NULL; + GList *clist, *l; + + clist = e_categories_get_list (); + for (l = clist; l; l = l->next) { + const char *cname = l->data; + struct _filter_option *fo = g_new0 (struct _filter_option, 1); + + fo->title = g_strdup (cname); + fo->value = g_strdup (cname); + res = g_slist_prepend (res, fo); + } + + g_list_free (clist); + + return g_slist_reverse (res); +} diff --git a/e-util/e-util.h b/e-util/e-util.h index b6ff33429d..a27602848c 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -125,6 +125,8 @@ gboolean e_util_read_file (const gchar *filename, gsize *read, GError **error); +GSList *e_util_get_category_filter_options (void); + G_END_DECLS #endif /* _E_UTIL_H_ */ -- cgit v1.2.3 From f21ef40ef391faa03d311ddce7668cce25215c07 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 9 Dec 2008 12:40:08 +0000 Subject: ** Fix for bug #555663 2008-12-09 Milan Crha ** Fix for bug #555663 * gconf-bridge.c: (struct WindowBinding), (gconf_bridge_bind_window), (window_binding_unbind): Do not overwrite signal id. svn path=/trunk/; revision=36853 --- e-util/ChangeLog | 7 +++++++ e-util/gconf-bridge.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 18ab054e84..0fe2400300 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2008-12-09 Milan Crha + + ** Fix for bug #555663 + + * gconf-bridge.c: (struct WindowBinding), (gconf_bridge_bind_window), + (window_binding_unbind): Do not overwrite signal id. + 2008-12-05 Milan Crha ** Part of fix for bug #332629 diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c index 5135eb1d30..451b7052cb 100644 --- a/e-util/gconf-bridge.c +++ b/e-util/gconf-bridge.c @@ -70,6 +70,7 @@ typedef struct { GtkWindow *window; gulong configure_event_id; + gulong window_state_event_id; gulong unmap_id; guint sync_timeout_id; } WindowBinding; @@ -819,7 +820,7 @@ gconf_bridge_bind_window (GConfBridge *bridge, (window_binding_configure_event_cb), binding); - binding->configure_event_id = + binding->window_state_event_id = g_signal_connect (window, "window_state_event", G_CALLBACK @@ -856,6 +857,8 @@ window_binding_unbind (WindowBinding *binding) if (binding->window) { g_signal_handler_disconnect (binding->window, binding->configure_event_id); + g_signal_handler_disconnect (binding->window, + binding->window_state_event_id); g_signal_handler_disconnect (binding->window, binding->unmap_id); -- cgit v1.2.3 From 65145381a69be1ac144c6e6dc7c2ab3fdb05d3b7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 10 Dec 2008 11:05:01 +0000 Subject: ** Fix for bug #563870 2008-12-10 Milan Crha ** Fix for bug #563870 * e-util/e-util-labels.h: (e_util_labels_get_filter_options): * e-util/e-util-labels.c: (e_util_labels_get_filter_options): New helper function to be used in FilterOption. * filter/Makefile.am: * filter/filter-label.h: * filter/filter-label.c: Drop, not used anywhere. * filter/filter-element.c: * filter/rule-context.c: Remove dropped include and code. * filter/filter-option.c: (get_dynamic_options), (xml_create), (get_widget): Evaluate dynamic options even on create, to have them available for saved searches even before the widget itself is shown. * mail/vfoldertypes.xml: * mail/filtertypes.xml: * mail/searchtypes.xml: Use dynamic filter option. * mail/message-list.c: Drop unused header include. svn path=/trunk/; revision=36863 --- e-util/ChangeLog | 8 ++++++++ e-util/e-util-labels.c | 37 +++++++++++++++++++++++++++++++++++++ e-util/e-util-labels.h | 2 ++ 3 files changed, 47 insertions(+) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 0fe2400300..b06be75c5b 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,11 @@ +2008-12-10 Milan Crha + + ** Part of fix for bug #563870 + + * e-util-labels.h: (e_util_labels_get_filter_options): + * e-util-labels.c: (e_util_labels_get_filter_options): + New helper function to be used in FilterOption. + 2008-12-09 Milan Crha ** Fix for bug #555663 diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c index da32f233c5..88fff080b7 100644 --- a/e-util/e-util-labels.c +++ b/e-util/e-util-labels.c @@ -29,8 +29,10 @@ #include +#include "e-util.h" #include "e-util-labels.h" #include "e-dialog-utils.h" +#include "filter/filter-option.h" /* Note, the first element of each EUtilLabel must NOT be translated */ EUtilLabel label_defaults[LABEL_DEFAULTS_NUM] = { @@ -543,3 +545,38 @@ e_util_labels_get_color_str (GSList *labels, const char *tag) return label->colour; } + +/** + * e_util_labels_get_filter_options: + * Returns list of newly allocated struct _filter_option-s, to be used in filters. + **/ +GSList * +e_util_labels_get_filter_options (void) +{ + GSList *known = e_util_labels_parse (NULL), *l; + GSList *res = NULL; + + for (l = known; l; l = l->next) { + EUtilLabel *label = l->data; + const char *tag; + struct _filter_option *fo; + + if (!label) + continue; + + tag = label->tag; + + if (tag && strncmp (tag, "$Label", 6) == 0) + tag += 6; + + fo = g_new0 (struct _filter_option, 1); + fo->title = e_str_without_underscores (label->name); + fo->value = g_strdup (tag); + + res = g_slist_prepend (res, fo); + } + + e_util_labels_free (known); + + return g_slist_reverse (res); +} diff --git a/e-util/e-util-labels.h b/e-util/e-util-labels.h index a9dd5613bc..26520ff226 100644 --- a/e-util/e-util-labels.h +++ b/e-util/e-util-labels.h @@ -52,4 +52,6 @@ const char *e_util_labels_get_name (GSList *labels, const char *tag); gboolean e_util_labels_get_color (GSList *labels, const char *tag, GdkColor *color); const char *e_util_labels_get_color_str (GSList *labels, const char *tag); +GSList * e_util_labels_get_filter_options (void); + #endif /* _E_UTIL_LABELS_H */ -- cgit v1.2.3 From f9987008ded88dd073458bbf3d80417e032c5e3b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 10 Dec 2008 11:55:08 +0000 Subject: ** Fixes bug #563250 2008-12-10 Matthew Barnes ** Fixes bug #563250 * e-util/e-util.c (e_get_accels_filename): New function returns the filename where custom keyboard accelerators are stored. Currently only applies to the various editor windows in Evolution. * shell/main.c (main): Load on startup and save on shutdown, custom keyboard accelerators. svn path=/trunk/; revision=36864 --- e-util/ChangeLog | 9 +++++++++ e-util/e-util.c | 23 ++++++++++++++++++++++- e-util/e-util.h | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index b06be75c5b..2cc9357c29 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,12 @@ +2008-12-10 Matthew Barnes + + ** Fixes part of bug #563250 + + * e-util.c (e_get_accels_filename): + New function returns the filename where custom keyboard + accelerators are stored. Currently only applies to the + various editor windows in Evolution. + 2008-12-10 Milan Crha ** Part of fix for bug #563870 diff --git a/e-util/e-util.c b/e-util/e-util.c index 215a494df9..4ab1a39636 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #ifdef G_OS_WIN32 #include @@ -71,6 +71,27 @@ e_get_user_data_dir (void) return dirname; } +/** + * e_get_accels_filename: + * + * Returns the name of the user data file containing custom keyboard + * accelerator specifications. + * + * Returns: filename for accelerator specifications + **/ +const gchar * +e_get_accels_filename (void) +{ + static gchar *filename = NULL; + + if (G_UNLIKELY (filename == NULL)) + filename = g_build_filename ( + gnome_user_dir_get (), + "accels", PACKAGE, NULL); + + return filename; +} + /** * e_display_help: * @parent: a parent #GtkWindow or %NULL diff --git a/e-util/e-util.h b/e-util/e-util.h index a27602848c..e2eafacd75 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -41,6 +41,7 @@ typedef enum { } EFocus; const gchar * e_get_user_data_dir (void); +const gchar * e_get_accels_filename (void); void e_display_help (GtkWindow *parent, const gchar *link_id); -- cgit v1.2.3 From fd635b63259a896d90f1aab94abf048ca9a567ce Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 22 Dec 2008 16:10:28 +0000 Subject: ** Fixes bug #564860 2008-12-22 Matthew Barnes ** Fixes bug #564860 * e-util/e-util-label.c (e_util_labels_parse): Don't crash on malformed label strings. svn path=/trunk/; revision=36929 --- e-util/ChangeLog | 7 +++++++ e-util/e-util-labels.c | 4 ++++ 2 files changed, 11 insertions(+) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 2cc9357c29..2c29c89b98 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2008-12-22 Matthew Barnes + + ** Fixes bug #564860 + + * e-util-label.c (e_util_labels_parse): + Don't crash on malformed label strings. + 2008-12-10 Matthew Barnes ** Fixes part of bug #563250 diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c index 88fff080b7..85984da59c 100644 --- a/e-util/e-util-labels.c +++ b/e-util/e-util-labels.c @@ -71,6 +71,10 @@ e_util_labels_parse (GConfClient *client) char *color, *name, *tag; name = buf = list->data; color = strrchr (buf, ':'); + if (color == NULL) { + g_free (buf); + continue; + } *color++ = '\0'; tag = strchr (color, '|'); -- cgit v1.2.3 From ce59fcad4c7ba2ef848c396448d347d9a1c7ab52 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 1 Jan 2009 22:17:12 +0000 Subject: Use the translated the EConfigItem label when building the UI. 2009-01-01 Matthew Barnes * e-util/e-config.c (ec_rebuild): Use the translated the EConfigItem label when building the UI. svn path=/trunk/; revision=36961 --- e-util/ChangeLog | 5 +++++ e-util/e-config.c | 15 ++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 2c29c89b98..92e6f1d567 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,8 @@ +2009-01-01 Matthew Barnes + + * e-config.c (ec_rebuild): + Use the translated the EConfigItem label when building the UI. + 2008-12-22 Matthew Barnes ** Fixes bug #564860 diff --git a/e-util/e-config.c b/e-util/e-config.c index 03a553feb2..4530d7a78b 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -422,10 +423,14 @@ ec_rebuild(EConfig *emp) for (wn = (struct _widget_node *)p->widgets.head;wn->next;wn=wn->next) { struct _EConfigItem *item = wn->item; + const gchar *translated_label = NULL; GtkWidget *w; d(printf(" '%s'\n", item->path)); + if (item->label != NULL) + translated_label = gettext (item->label); + /* If the last section doesn't contain anything, hide it */ if (sectionnode != NULL && sectionnode->frame != NULL @@ -524,7 +529,7 @@ ec_rebuild(EConfig *emp) } else { page = gnome_druid_page_edge_new(item->type == E_CONFIG_PAGE_START?GNOME_EDGE_START:GNOME_EDGE_FINISH); gtk_widget_show(page); - gnome_druid_page_edge_set_title((GnomeDruidPageEdge *)page, item->label); + gnome_druid_page_edge_set_title((GnomeDruidPageEdge *)page, translated_label); gnome_druid_insert_page((GnomeDruid *)druid, pagenode?(GnomeDruidPage *)pagenode->frame:NULL, (GnomeDruidPage *)page); } if (item->type == E_CONFIG_PAGE_FINISH) { @@ -579,13 +584,13 @@ ec_rebuild(EConfig *emp) if (emp->type == E_CONFIG_DRUID) { w = gnome_druid_page_standard_new(); gtk_widget_show(w); - gnome_druid_page_standard_set_title((GnomeDruidPageStandard *)w, item->label); + gnome_druid_page_standard_set_title((GnomeDruidPageStandard *)w, translated_label); gnome_druid_insert_page((GnomeDruid *)druid, pagenode?(GnomeDruidPage *)pagenode->frame:NULL, (GnomeDruidPage *)w); wn->frame = w; page = ((GnomeDruidPageStandard *)w)->vbox; connect = TRUE; } else { - w = gtk_label_new_with_mnemonic (item->label); + w = gtk_label_new_with_mnemonic (translated_label); gtk_widget_show(w); page = gtk_vbox_new(FALSE, 12); gtk_container_set_border_width((GtkContainer *)page, 12); @@ -653,8 +658,8 @@ ec_rebuild(EConfig *emp) wn->frame = NULL; } - if (item->label) { - char *txt = g_strdup_printf("%s", item->label); + if (translated_label != NULL) { + char *txt = g_strdup_printf("%s", translated_label); label = g_object_new(gtk_label_get_type(), "label", txt, -- cgit v1.2.3 From 5b8d7899771fd554bb2af73bdcb7905cf07dc8ab Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 11 Jan 2009 01:49:39 +0000 Subject: Now that we require GTK+ 2.14, use gtk_show_uri() instead of 2009-01-10 Matthew Barnes * e-util/e-util.c (e_display_help): Now that we require GTK+ 2.14, use gtk_show_uri() instead of gnome_help_display(). svn path=/trunk/; revision=37034 --- e-util/ChangeLog | 6 ++++++ e-util/e-util.c | 20 +++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 92e6f1d567..1d0bfb62ad 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,9 @@ +2009-01-10 Matthew Barnes + + * e-util.c (e_display_help): + Now that we require GTK+ 2.14, use gtk_show_uri() instead of + gnome_help_display(). + 2009-01-01 Matthew Barnes * e-config.c (ec_rebuild): diff --git a/e-util/e-util.c b/e-util/e-util.c index 4ab1a39636..0e43f092b2 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #ifdef G_OS_WIN32 @@ -106,11 +105,23 @@ void e_display_help (GtkWindow *parent, const gchar *link_id) { + GString *uri; GtkWidget *dialog; + GdkScreen *screen = NULL; GError *error = NULL; + guint32 timestamp; - if (gnome_help_display ("evolution.xml", link_id, &error)) - return; + uri = g_string_new ("ghelp:" PACKAGE); + timestamp = gtk_get_current_event_time (); + + if (parent != NULL) + screen = gtk_widget_get_screen (GTK_WIDGET (parent)); + + if (link_id != NULL) + g_string_append_printf (uri, "?%s", link_id); + + if (gtk_show_uri (screen, uri->str, timestamp, &error)) + goto exit; dialog = gtk_message_dialog_new_with_markup ( parent, GTK_DIALOG_DESTROY_WITH_PARENT, @@ -125,6 +136,9 @@ e_display_help (GtkWindow *parent, gtk_widget_destroy (dialog); g_error_free (error); + +exit: + g_string_free (uri, TRUE); } /** -- cgit v1.2.3 From 577f9fdffbbb9e57b44b0290f1aea8088c6f0976 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 11 Jan 2009 04:52:38 +0000 Subject: Remove unneeded #include . 2009-01-10 Matthew Barnes * addressbook/gui/contact-editor/e-contact-editor-address.c: * addressbook/gui/contact-editor/e-contact-editor-fullname.c: * addressbook/gui/contact-editor/e-contact-editor-im.c: * addressbook/gui/widgets/e-addressbook-view.c: * addressbook/printing/e-contact-print.c: * calendar/gui/calendar-commands.c: * calendar/gui/e-cal-list-view.c: * calendar/gui/e-day-view.c: * calendar/gui/e-itip-control.c: * calendar/gui/e-meeting-list-view.c: * calendar/gui/e-meeting-store.c: * calendar/gui/e-week-view.c: * calendar/gui/gnome-cal.c: * calendar/gui/memos-control.c: * calendar/gui/tasks-control.c: * e-util/e-dialog-utils.c: * mail/em-folder-view.c: * mail/importers/mail-importer.c: * shell/e-shell.c: * shell/evolution-shell-component-utils.c: * shell/importer/intelligent.c: * shell/main.c: * widgets/menus/gal-view-collection.c: * widgets/menus/gal-view-instance.c: Remove unneeded #include . svn path=/trunk/; revision=37036 --- e-util/ChangeLog | 5 +++++ e-util/e-dialog-utils.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 1d0bfb62ad..a23eb07533 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,8 @@ +2009-01-10 Matthew Barnes + + * e-dialog-utils.c: + Remove unneeded #include . + 2009-01-10 Matthew Barnes * e-util.c (e_display_help): diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index ecf9e7ec1e..a3bde484d5 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -27,6 +27,7 @@ #include "e-dialog-utils.h" +#include #include #include @@ -36,7 +37,6 @@ #include #include -#include #include "e-util/e-util.h" #include "e-util/e-error.h" -- cgit v1.2.3 From 2b820fc4e2d6404ca281e279761cd5f877fdbf54 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 11 Jan 2009 13:55:04 +0000 Subject: New convenience function calls gtk_show_uri() and displays an error dialog 2009-01-11 Matthew Barnes * e-util/e-util.c (e_show_uri): New convenience function calls gtk_show_uri() and displays an error dialog if the URI cannot be shown. * addressbook/gui/widgets/eab-contact-display.c (eab_uri_popup_link_open), (on_link_clicked): * calendar/gui/e-cal-component-preview (on_link_clicked): * calendar/gui/e-cal-component-memo-preview (on_link_clicked): * calendar/gui/e-memo-table.c (open_url_cb): * calendar/gui/dialogs/comp-editor.c (open_attachment): * composer/e-msg-composer.c (msg_composer_link_clicked): * mail/em-folder-view.c (emfv_format_link_clicked): * mail/em-popup.c (emp_uri_popup_link_open): * plugins/mailing-list-actions/mailing-list-actions.c (emla_list_action_do): * shell/e-shell-window-commands.c (command_open_faq): * widgets/misc/e-attachment-bar.c (eab_icon_clicked_cb): * widgets/misc/e-url-entry.c (button_clicked_cb): Call e_show_uri() instead of gnome_url_show(). * e-util/e-error.c (ee_response): Call e_display_help() instead of gnome_url_show(). * mail/em-config.c: * mail/em-menu.c: Remove unneeded #include svn path=/trunk/; revision=37037 --- e-util/ChangeLog | 9 +++++++++ e-util/e-error.c | 10 ++-------- e-util/e-util.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ e-util/e-util.h | 2 ++ 4 files changed, 57 insertions(+), 8 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index a23eb07533..365589f575 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,12 @@ +2009-01-11 Matthew Barnes + + * e-error.c (ee_response): + Call e_display_help() instead of gnome_url_show(). + + * e-util.c (e_show_uri): + New convenience function calls gtk_show_uri() and displays an + error dialog if the URI cannot be shown. + 2009-01-10 Matthew Barnes * e-dialog-utils.c: diff --git a/e-util/e-error.c b/e-util/e-error.c index 763a9ca540..da4d034606 100644 --- a/e-util/e-error.c +++ b/e-util/e-error.c @@ -30,10 +30,10 @@ #include #include -#include #include +#include "e-util.h" #include "e-util-private.h" #include "e-error.h" @@ -395,15 +395,9 @@ ee_build_label(GString *out, const char *fmt, GPtrArray *args, static void ee_response(GtkWidget *w, guint button, struct _e_error *e) { - GError *err = NULL; - if (button == GTK_RESPONSE_HELP) { g_signal_stop_emission_by_name(w, "response"); - gnome_url_show(e->help_uri, &err); - if (err) { - g_warning("Unable to run help uri: %s", err->message); - g_error_free(err); - } + e_display_help (GTK_WINDOW (w), e->help_uri); } } diff --git a/e-util/e-util.c b/e-util/e-util.c index 0e43f092b2..d4bded2d6b 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -91,6 +91,50 @@ e_get_accels_filename (void) return filename; } +/** + * e_show_uri: + * @parent: a parent #GtkWindow or %NULL + * @uri: the URI to show + * + * Launches the default application to show the given URI. The URI must + * be of a form understood by GIO. If the URI cannot be shown, it presents + * a dialog describing the error. The dialog is set as transient to @parent + * if @parent is non-%NULL. + **/ +void +e_show_uri (GtkWindow *parent, + const gchar *uri) +{ + GtkWidget *dialog; + GdkScreen *screen = NULL; + GError *error = NULL; + guint32 timestamp; + + g_return_if_fail (uri != NULL); + + timestamp = gtk_get_current_event_time (); + + if (parent != NULL) + screen = gtk_widget_get_screen (GTK_WIDGET (parent)); + + if (gtk_show_uri (screen, uri, timestamp, &error)) + return; + + dialog = gtk_message_dialog_new_with_markup ( + parent, GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, + "%s", + _("Could not open the link.")); + + gtk_message_dialog_format_secondary_text ( + GTK_MESSAGE_DIALOG (dialog), "%s", error->message); + + gtk_dialog_run (GTK_DIALOG (dialog)); + + gtk_widget_destroy (dialog); + g_error_free (error); +} + /** * e_display_help: * @parent: a parent #GtkWindow or %NULL diff --git a/e-util/e-util.h b/e-util/e-util.h index e2eafacd75..4f82df471b 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -42,6 +42,8 @@ typedef enum { const gchar * e_get_user_data_dir (void); const gchar * e_get_accels_filename (void); +void e_show_uri (GtkWindow *parent, + const gchar *uri); void e_display_help (GtkWindow *parent, const gchar *link_id); -- cgit v1.2.3 From 79e0bf750c12b043aae5a99e0d95d48e28680073 Mon Sep 17 00:00:00 2001 From: Philip Van hoof Date: Mon, 12 Jan 2009 08:44:53 +0000 Subject: e-util/e-plugin.c e-util/e-plugin.h EPlugins must be loaded after Bonobo 2009-01-12 Philip Van hoof * e-util/e-plugin.c * e-util/e-plugin.h * shell/main.c: EPlugins must be loaded after Bonobo init, else variables like `session` are not available for plugin's initialization functions. (Fixes Bug #565681) svn path=/trunk/; revision=37052 --- e-util/e-plugin.c | 46 ++++++++++++++++++++++++++++++++++++---------- e-util/e-plugin.h | 1 + 2 files changed, 37 insertions(+), 10 deletions(-) (limited to 'e-util') diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index 93ec47f3b6..7d778b59e0 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -608,8 +608,7 @@ e_plugin_load_plugins(void) } while ( (d = g_dir_read_name(dir)) ) { - if (strlen(d) > 6 - && !strcmp(d + strlen(d) - 6, ".eplug")) { + if (g_str_has_suffix (d, ".eplug")) { char * name = g_build_filename(path, d, NULL); ep_load(name, i); @@ -987,8 +986,10 @@ static gpointer epl_parent_class; pages. */ +static GList *missing_symbols = NULL; + static int -epl_loadmodule(EPlugin *ep) +epl_loadmodule(EPlugin *ep, gboolean fatal) { EPluginLib *epl = E_PLUGIN_LIB (ep); EPluginLibEnableFunc enable; @@ -997,7 +998,10 @@ epl_loadmodule(EPlugin *ep) return 0; if ((epl->module = g_module_open(epl->location, 0)) == NULL) { - g_warning("can't load plugin '%s': %s", epl->location, g_module_error()); + if (fatal) + g_warning("can't load plugin '%s': %s", epl->location, g_module_error()); + else + missing_symbols = g_list_prepend (missing_symbols, g_object_ref (ep)); return -1; } @@ -1013,6 +1017,22 @@ epl_loadmodule(EPlugin *ep) return 0; } +void +e_plugin_load_plugins_with_missing_symbols (void) +{ + GList *list = missing_symbols; + + while (list) { + EPlugin *ep = list->data; + epl_loadmodule (ep, TRUE); + g_object_unref (ep); + list = g_list_next (list); + } + + g_list_free (missing_symbols); + missing_symbols = NULL; +} + static void * epl_invoke(EPlugin *ep, const char *name, void *data) { @@ -1024,7 +1044,7 @@ epl_invoke(EPlugin *ep, const char *name, void *data) return NULL; } - if (epl_loadmodule(ep) != 0) + if (epl_loadmodule(ep, FALSE) != 0) return NULL; if (!g_module_symbol(epl->module, name, (void *)&cb)) { @@ -1041,7 +1061,7 @@ epl_get_symbol(EPlugin *ep, const gchar *name) EPluginLib *epl = E_PLUGIN_LIB (ep); gpointer symbol; - if (epl_loadmodule (ep) != 0) + if (epl_loadmodule (ep, FALSE) != 0) return NULL; if (!g_module_symbol (epl->module, name, &symbol)) @@ -1080,9 +1100,15 @@ epl_construct(EPlugin *ep, xmlNodePtr root) tmp = xmlGetProp(root, (const unsigned char *)"load-on-startup"); if (tmp) { + if (strcmp (tmp, "after-ui") == 0) { + missing_symbols = g_list_prepend (missing_symbols, g_object_ref (ep)); + } else { + if (epl_loadmodule(ep, FALSE) != 0) { + xmlFree(tmp); + return -1; + } + } xmlFree(tmp); - if (epl_loadmodule(ep) != 0) - return -1; } } @@ -1097,7 +1123,7 @@ epl_get_configure_widget (EPlugin *ep) pd (printf ("\n epl_get_configure_widget \n")); - if (epl_loadmodule (ep) != 0) { + if (epl_loadmodule (ep, FALSE) != 0) { pd (printf ("\n epl_loadmodule \n")); return NULL; } @@ -1122,7 +1148,7 @@ epl_enable(EPlugin *ep, int state) return; /* this will noop if we're disabling since we tested it above */ - if (epl_loadmodule(ep) != 0) + if (epl_loadmodule(ep, FALSE) != 0) return; if (g_module_symbol(epl->module, "e_plugin_lib_enable", (void *)&enable)) { diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h index 4994861d6f..0b31409c96 100644 --- a/e-util/e-plugin.h +++ b/e-util/e-plugin.h @@ -134,6 +134,7 @@ GType e_plugin_get_type(void); int e_plugin_construct(EPlugin *ep, xmlNodePtr root); void e_plugin_add_load_path(const char *); int e_plugin_load_plugins(void); +void e_plugin_load_plugins_with_missing_symbols(void); GSList * e_plugin_list_plugins(void); void e_plugin_register_type(GType type); -- cgit v1.2.3 From 7f8cab85e3d035f34da1a3736bf0668797a3746a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 15 Jan 2009 15:42:17 +0000 Subject: Compiler warning fix. 2009-01-15 Milan Crha * e-plugin.c: (epl_construct): Compiler warning fix. svn path=/trunk/; revision=37081 --- e-util/ChangeLog | 4 ++++ e-util/e-plugin.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 365589f575..5fc6526a85 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,7 @@ +2009-01-15 Milan Crha + + * e-plugin.c: (epl_construct): Compiler warning fix. + 2009-01-11 Matthew Barnes * e-error.c (ee_response): diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index 7d778b59e0..d43238be0a 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -1100,7 +1100,7 @@ epl_construct(EPlugin *ep, xmlNodePtr root) tmp = xmlGetProp(root, (const unsigned char *)"load-on-startup"); if (tmp) { - if (strcmp (tmp, "after-ui") == 0) { + if (strcmp ((const char *)tmp, "after-ui") == 0) { missing_symbols = g_list_prepend (missing_symbols, g_object_ref (ep)); } else { if (epl_loadmodule(ep, FALSE) != 0) { -- cgit v1.2.3 From 9c28e70fb0e7dc3eea887938651ef66cceb68e05 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 14 Feb 2009 04:25:11 +0000 Subject: ** Fixes part of bug #564229 2009-02-13 Matthew Barnes ** Fixes part of bug #564229 * e-util/e-plugin-ui.c (plugin_ui_hook_class_init): Initialize the EPluginUI registry during class initialization, so that it's sure to be there when we need it. * plugins/email-custom-header/email-custom-header.c: (e_plugin_lib_get_configure_widget): Do not use uninitialized variable. svn path=/trunk/; revision=37265 --- e-util/ChangeLog | 8 ++++++++ e-util/e-plugin-ui.c | 11 +++++------ 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 5fc6526a85..a817d0d033 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,11 @@ +2009-02-13 Matthew Barnes + + ** Fixes part of bug #564229 + + * e-plugin-ui.c (plugin_ui_hook_class_init): + Initialize the EPluginUI registry during class initialization, + so that it's sure to be there when we need it. + 2009-01-15 Milan Crha * e-plugin.c: (epl_construct): Compiler warning fix. diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c index 0b28adda5d..c192ece939 100644 --- a/e-util/e-plugin-ui.c +++ b/e-util/e-plugin-ui.c @@ -83,12 +83,6 @@ plugin_ui_registry_insert (EPluginUIHook *hook, { GHashTable *hash_table; - if (registry == NULL) - registry = g_hash_table_new_full ( - g_direct_hash, g_direct_equal, - (GDestroyNotify) NULL, - (GDestroyNotify) g_hash_table_destroy); - hash_table = g_hash_table_lookup (registry, hook); if (hash_table == NULL) { hash_table = g_hash_table_new (g_direct_hash, g_direct_equal); @@ -325,6 +319,11 @@ plugin_ui_hook_class_init (EPluginUIHookClass *class) plugin_hook_class->id = E_PLUGIN_UI_HOOK_CLASS_ID; plugin_hook_class->construct = plugin_ui_hook_construct; plugin_hook_class->enable = plugin_ui_hook_enable; + + registry = g_hash_table_new_full ( + g_direct_hash, g_direct_equal, + (GDestroyNotify) NULL, + (GDestroyNotify) g_hash_table_destroy); } static void -- cgit v1.2.3 From 80b575ffb834f003c7e0742b60ac02d5cb09a43a Mon Sep 17 00:00:00 2001 From: Tobias Mueller Date: Tue, 7 Apr 2009 00:39:58 +0000 Subject: ** Fixes bug #577989 2009-04-07 Tobias Mueller ** Fixes bug #577989 * conf-bridge.c (error_handler): Call gtk_message_dialog_new with a proper format string ("%s") svn path=/trunk/; revision=37496 --- e-util/ChangeLog | 7 +++++++ e-util/gconf-bridge.c | 1 + 2 files changed, 8 insertions(+) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index a817d0d033..4b29efd710 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2009-04-07 Tobias Mueller + + ** Fixes bug #577989 + + * conf-bridge.c (error_handler): + Call gtk_message_dialog_new with a proper format string ("%s") + 2009-02-13 Matthew Barnes ** Fixes part of bug #564229 diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c index 451b7052cb..66dcbc7ea2 100644 --- a/e-util/gconf-bridge.c +++ b/e-util/gconf-bridge.c @@ -1223,6 +1223,7 @@ error_handler (GConfClient *client, dlg = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, + "%s", message); g_free (message); -- cgit v1.2.3 From e42f27652709397453431b75c32601a4f4effd48 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 23 Apr 2009 10:02:07 -0400 Subject: =?UTF-8?q?Bug=20577929=20=E2=80=93=20Consolidate=20marshallers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consolidate all marshalling specifications to e-util/e-marshal.list. This reduces code duplication and makes it slightly easier to locate unused marshallers. --- e-util/Makefile.am | 8 +++---- e-util/e-signature-list.c | 2 -- e-util/e-text-event-processor.c | 1 - e-util/e-util-marshal.list | 46 ----------------------------------------- e-util/e-util.c | 4 ---- e-util/e-util.h | 2 +- 6 files changed, 5 insertions(+), 58 deletions(-) delete mode 100644 e-util/e-util-marshal.list (limited to 'e-util') diff --git a/e-util/Makefile.am b/e-util/Makefile.am index f003ff9068..73665a3516 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -58,6 +58,7 @@ eutilinclude_HEADERS = \ e-import.h \ e-logger.h \ e-non-intrusive-error-dialog.h \ + e-marshal.h \ e-menu.h \ e-mktemp.h \ e-print.h \ @@ -76,12 +77,10 @@ eutilinclude_HEADERS = \ e-text-event-processor.h \ e-util.h \ e-util-labels.h \ - e-util-marshal.h \ e-xml-utils.h libeutil_la_SOURCES = \ $(eutilinclude_HEADERS) \ - e-util-marshal.c \ e-bconf-map.c \ e-categories-config.c \ e-config.c \ @@ -100,6 +99,7 @@ libeutil_la_SOURCES = \ e-import.c \ e-logger.c \ e-non-intrusive-error-dialog.c \ + e-marshal.c \ e-menu.c \ e-mktemp.c \ e-plugin.c \ @@ -123,7 +123,7 @@ libeutil_la_SOURCES = \ gconf-bridge.h \ $(PLATFORM_SOURCES) -MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h +MARSHAL_GENERATED = e-marshal.c e-marshal.h @EVO_MARSHAL_RULE@ libeutil_la_LDFLAGS = $(NO_UNDEFINED) @@ -164,7 +164,7 @@ EXTRA_DIST = \ e-system.error.xml \ $(pilot_sources) \ ChangeLog.pre-1-4 \ - e-util-marshal.list + e-marshal.list BUILT_SOURCES = $(MARSHAL_GENERATED) $(error_DATA) CLEANFILES = $(BUILT_SOURCES) diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c index 898bff9057..d2b575c15a 100644 --- a/e-util/e-signature-list.c +++ b/e-util/e-signature-list.c @@ -29,8 +29,6 @@ #include -#include "e-util-marshal.h" - #include "e-signature-list.h" struct _ESignatureListPrivate { diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c index e381e86342..b515f33f57 100644 --- a/e-util/e-text-event-processor.c +++ b/e-util/e-text-event-processor.c @@ -24,7 +24,6 @@ #include -#include "e-util-marshal.h" #include "e-text-event-processor.h" #include "e-util.h" diff --git a/e-util/e-util-marshal.list b/e-util/e-util-marshal.list deleted file mode 100644 index 9314f25777..0000000000 --- a/e-util/e-util-marshal.list +++ /dev/null @@ -1,46 +0,0 @@ -BOOLEAN:INT,INT,OBJECT,INT,INT,UINT -BOOLEAN:INT,POINTER,INT,OBJECT,INT,INT,UINT -BOOLEAN:NONE -BOOLEAN:OBJECT -BOOLEAN:OBJECT,DOUBLE,DOUBLE,BOOLEAN -BOOLEAN:POINTER,POINTER,INT,INT,INT -BOOLEAN:POINTER,POINTER,POINTER,INT,INT,INT -BOOLEAN:STRING,INT -DOUBLE:OBJECT,DOUBLE,DOUBLE,BOOLEAN -INT:BOXED -INT:INT -INT:INT,INT,BOXED -INT:INT,POINTER,INT,BOXED -INT:OBJECT,BOXED -INT:POINTER -NONE:BOXED,INT -NONE:BOXED,INT,INT -NONE:INT,INT -NONE:INT,INT,BOXED -NONE:INT,INT,OBJECT -NONE:INT,INT,OBJECT,BOXED,UINT,UINT -NONE:INT,INT,OBJECT,INT,INT,BOXED,UINT,UINT -NONE:INT,INT,OBJECT,POINTER,UINT,UINT -NONE:INT,INT,OBJECT,UINT -NONE:INT,INT,STRING,STRING -NONE:INT,INT,STRING,STRING,POINTER -NONE:INT,POINTER -NONE:INT,POINTER,INT,BOXED -NONE:INT,POINTER,INT,OBJECT -NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,UINT -NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT -NONE:INT,POINTER,INT,OBJECT,UINT -NONE:INT,STRING -NONE:OBJECT,OBJECT -NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN -NONE:POINTER,BOOLEAN -NONE:POINTER,BOOLEAN,BOOLEAN,BOOLEAN -NONE:POINTER,INT -NONE:POINTER,INT,INT -NONE:POINTER,INT,INT,INT -NONE:POINTER,INT,INT,INT,INT -NONE:POINTER,INT,OBJECT -NONE:POINTER,POINTER -NONE:POINTER,POINTER,INT -OBJECT:OBJECT,DOUBLE,DOUBLE,BOOLEAN -POINTER:NONE diff --git a/e-util/e-util.c b/e-util/e-util.c index d4bded2d6b..0b28404c82 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -335,10 +335,6 @@ e_write_file_uri (const gchar *filename, const gchar *data) return res; } -/* Include build marshalers */ - -#include "e-util-marshal.h" - static gint epow10 (gint number) { diff --git a/e-util/e-util.h b/e-util/e-util.h index 4f82df471b..021e3286c7 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -29,7 +29,7 @@ #include #include -#include +#include G_BEGIN_DECLS -- cgit v1.2.3 From 16c6f0a3071bf758ff7124202554bdfb8680bd2c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 23 Apr 2009 13:46:43 -0400 Subject: Add a missing file. --- e-util/e-marshal.list | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 e-util/e-marshal.list (limited to 'e-util') diff --git a/e-util/e-marshal.list b/e-util/e-marshal.list new file mode 100644 index 0000000000..366602491b --- /dev/null +++ b/e-util/e-marshal.list @@ -0,0 +1,68 @@ +BOOLEAN:BOXED,POINTER,POINTER +BOOLEAN:INT,INT,OBJECT,INT,INT,UINT +BOOLEAN:INT,POINTER,INT,OBJECT,INT,INT,UINT +BOOLEAN:NONE +BOOLEAN:OBJECT +BOOLEAN:OBJECT,DOUBLE,DOUBLE,BOOLEAN +BOOLEAN:POINTER +BOOLEAN:POINTER,BOOLEAN,POINTER +BOOLEAN:POINTER,POINTER +BOOLEAN:POINTER,POINTER,INT,INT,INT +BOOLEAN:POINTER,POINTER,POINTER,INT,INT,INT +BOOLEAN:POINTER,POINTER,POINTER,POINTER +BOOLEAN:STRING +BOOLEAN:STRING,INT +DOUBLE:OBJECT,DOUBLE,DOUBLE,BOOLEAN +INT:BOXED +INT:INT +INT:INT,INT,BOXED +INT:INT,POINTER,INT,BOXED +INT:OBJECT,BOXED +INT:POINTER +NONE:BOXED,INT +NONE:BOXED,INT,INT +NONE:ENUM,ENUM +NONE:ENUM,STRING +NONE:INT,BOOLEAN +NONE:INT,INT +NONE:INT,INT,BOXED +NONE:INT,INT,OBJECT +NONE:INT,INT,OBJECT,BOXED,UINT,UINT +NONE:INT,INT,OBJECT,INT,INT,BOXED,UINT,UINT +NONE:INT,INT,OBJECT,POINTER,UINT,UINT +NONE:INT,INT,OBJECT,UINT +NONE:INT,INT,STRING,STRING +NONE:INT,INT,STRING,STRING,POINTER +NONE:INT,OBJECT +NONE:INT,POINTER +NONE:INT,POINTER,INT,BOXED +NONE:INT,POINTER,INT,OBJECT +NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,UINT +NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT +NONE:INT,POINTER,INT,OBJECT,UINT +NONE:INT,STRING +NONE:LONG,LONG +NONE:OBJECT,BOOLEAN +NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN +NONE:OBJECT,OBJECT +NONE:POINTER,BOOLEAN +NONE:POINTER,BOOLEAN,BOOLEAN,BOOLEAN +NONE:POINTER,ENUM +NONE:POINTER,INT +NONE:POINTER,INT,INT +NONE:POINTER,INT,INT,INT +NONE:POINTER,INT,INT,INT,INT +NONE:POINTER,INT,OBJECT +NONE:POINTER,POINTER +NONE:POINTER,POINTER,INT +NONE:POINTER,STRING +NONE:STRING,BOOL,INT,INT +NONE:STRING,DOUBLE +NONE:STRING,INT +NONE:STRING,INT,INT +NONE:STRING,POINTER,POINTER +NONE:STRING,STRING +NONE:STRING,STRING,STRING +NONE:STRING,STRING,UINT +OBJECT:OBJECT,DOUBLE,DOUBLE,BOOLEAN +POINTER:NONE -- cgit v1.2.3 From 0006bfb58ac91bac0768590827bd3dabba72c638 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 23 Apr 2009 16:50:54 -0400 Subject: =?UTF-8?q?Bug=20577898=20=E2=80=93=20Port=20ExoBinding=20to=20Evo?= =?UTF-8?q?lution?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Port Xfce's ExoBinding API to Evolution as EBinding. What this does is allow you to bind two GObject properties together such that their values are automatically kept in sync. The API also supports transformation functions, such as boolean inversion. I use this API heavily on the kill-bonobo branch and also in the attachment UI rewrite, so I'm merging this feature early. --- e-util/Makefile.am | 2 + e-util/e-binding.c | 536 +++++++++++++++++++++++++++++++++++++++++++++++++++++ e-util/e-binding.h | 118 ++++++++++++ 3 files changed, 656 insertions(+) create mode 100644 e-util/e-binding.c create mode 100644 e-util/e-binding.h (limited to 'e-util') diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 73665a3516..ee54891c1d 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -41,6 +41,7 @@ privsolib_LTLIBRARIES = libeutil.la libeconduit.la eutilinclude_HEADERS = \ e-bconf-map.h \ + e-binding.h \ e-categories-config.h \ e-config.h \ e-config-listener.h \ @@ -82,6 +83,7 @@ eutilinclude_HEADERS = \ libeutil_la_SOURCES = \ $(eutilinclude_HEADERS) \ e-bconf-map.c \ + e-binding.c \ e-categories-config.c \ e-config.c \ e-config-listener.c \ diff --git a/e-util/e-binding.c b/e-util/e-binding.c new file mode 100644 index 0000000000..6a29166cc1 --- /dev/null +++ b/e-util/e-binding.c @@ -0,0 +1,536 @@ +/* + * e-binding.c + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "e-binding.h" + +static gboolean +e_binding_transform_negate (const GValue *src_value, + GValue *dst_value) +{ + if (!g_value_transform (src_value, dst_value)) + return FALSE; + + g_value_set_boolean (dst_value, !g_value_get_boolean (dst_value)); + + return TRUE; +} + +static void +e_bind_properties_transfer (GObject *src_object, + GParamSpec *src_pspec, + GObject *dst_object, + GParamSpec *dst_pspec, + EBindingTransform transform, + gpointer user_data) +{ + const gchar *src_name; + const gchar *dst_name; + gboolean result; + GValue src_value = { 0, }; + GValue dst_value = { 0, }; + + src_name = g_param_spec_get_name (src_pspec); + dst_name = g_param_spec_get_name (dst_pspec); + + g_value_init (&src_value, G_PARAM_SPEC_VALUE_TYPE (src_pspec)); + g_object_get_property (src_object, src_name, &src_value); + + g_value_init (&dst_value, G_PARAM_SPEC_VALUE_TYPE (dst_pspec)); + result = (*transform) (&src_value, &dst_value, user_data); + + g_value_unset (&src_value); + + g_return_if_fail (result); + + g_param_value_validate (dst_pspec, &dst_value); + g_object_set_property (dst_object, dst_name, &dst_value); + g_value_unset (&dst_value); +} + +static void +e_bind_properties_notify (GObject *src_object, + GParamSpec *src_pspec, + gpointer data) +{ + EBindingLink *link = data; + + /* Block the destination handler for mutual bindings, + * so we don't recurse here. */ + if (link->dst_handler != 0) + g_signal_handler_block (link->dst_object, link->dst_handler); + + e_bind_properties_transfer ( + src_object, src_pspec, + link->dst_object, link->dst_pspec, + link->transform, link->user_data); + + /* Unblock destination handler. */ + if (link->dst_handler != 0) + g_signal_handler_unblock (link->dst_object, link->dst_handler); +} + +static void +e_binding_on_dst_object_destroy (gpointer data, + GObject *object) +{ + EBinding *binding = data; + + binding->link.dst_object = NULL; + + /* Calls e_binding_on_disconnect() */ + g_signal_handler_disconnect ( + binding->src_object, binding->link.handler); +} + +static void +e_binding_on_disconnect (gpointer data, + GClosure *closure) +{ + EBindingLink *link = data; + EBinding *binding; + + binding = (EBinding *) + (((gchar *) link) - G_STRUCT_OFFSET (EBinding, link)); + + if (binding->base.destroy != NULL) + binding->base.destroy (link->user_data); + + if (link->dst_object != NULL) + g_object_weak_unref ( + link->dst_object, + e_binding_on_dst_object_destroy, binding); + + g_slice_free (EBinding, binding); +} + +/* Recursively calls e_mutual_binding_on_disconnect_object2() */ +static void +e_mutual_binding_on_disconnect_object1 (gpointer data, + GClosure *closure) +{ + EMutualBinding *binding; + EBindingLink *link = data; + GObject *object2; + + binding = (EMutualBinding *) + (((gchar *) link) - G_STRUCT_OFFSET (EMutualBinding, direct)); + binding->reverse.dst_object = NULL; + + object2 = binding->direct.dst_object; + if (object2 != NULL) { + if (binding->base.destroy != NULL) + binding->base.destroy (binding->direct.user_data); + binding->direct.dst_object = NULL; + g_signal_handler_disconnect (object2, binding->reverse.handler); + g_slice_free (EMutualBinding, binding); + } +} + +/* Recursively calls e_mutual_binding_on_disconnect_object1() */ +static void +e_mutual_binding_on_disconnect_object2 (gpointer data, + GClosure *closure) +{ + EMutualBinding *binding; + EBindingLink *link = data; + GObject *object1; + + binding = (EMutualBinding *) + (((gchar *) link) - G_STRUCT_OFFSET (EMutualBinding, reverse)); + binding->direct.dst_object = NULL; + + object1 = binding->reverse.dst_object; + if (object1 != NULL) { + binding->reverse.dst_object = NULL; + g_signal_handler_disconnect (object1, binding->direct.handler); + } +} + +static void +e_binding_link_init (EBindingLink *link, + GObject *src_object, + const gchar *src_property, + GObject *dst_object, + GParamSpec *dst_pspec, + EBindingTransform transform, + GClosureNotify destroy_notify, + gpointer user_data) +{ + gchar *signal_name; + + link->dst_object = dst_object; + link->dst_pspec = dst_pspec; + link->dst_handler = 0; + link->transform = transform; + link->user_data = user_data; + + signal_name = g_strconcat ("notify::", src_property, NULL); + link->handler = g_signal_connect_data ( + src_object, signal_name, + G_CALLBACK (e_bind_properties_notify), + link, destroy_notify, 0); + g_free (signal_name); +} + +/** + * e_binding_new: + * @src_object: The source #GObject. + * @src_property: The name of the property to bind from. + * @dst_object: The destination #GObject. + * @dst_property: The name of the property to bind to. + * + * One-way binds @src_property in @src_object to @dst_property + * in @dst_object. + * + * Before binding the value of @dst_property is set to the + * value of @src_property. + * + * Returns: The descriptor of the binding. It is automatically + * removed if one of the objects is finalized. + **/ +EBinding * +e_binding_new (GObject *src_object, + const gchar *src_property, + GObject *dst_object, + const gchar *dst_property) +{ + return e_binding_new_full ( + src_object, src_property, + dst_object, dst_property, + NULL, NULL, NULL); +} + +/** + * e_binding_new_full: + * @src_object: The source #GObject. + * @src_property: The name of the property to bind from. + * @dst_object: The destination #GObject. + * @dst_property: The name of the property to bind to. + * @transform: Transformation function or %NULL. + * @destroy_notify: Callback function that is called on + * disconnection with @user_data or %NULL. + * @user_data: User data associated with the binding. + * + * One-way binds @src_property in @src_object to @dst_property + * in @dst_object. + * + * Before binding the value of @dst_property is set to the + * value of @src_property. + * + * Returns: The descriptor of the binding. It is automatically + * removed if one of the objects is finalized. + **/ +EBinding * +e_binding_new_full (GObject *src_object, + const gchar *src_property, + GObject *dst_object, + const gchar *dst_property, + EBindingTransform transform, + GDestroyNotify destroy_notify, + gpointer user_data) +{ + EBinding *binding; + GParamSpec *src_pspec; + GParamSpec *dst_pspec; + + g_return_val_if_fail (G_IS_OBJECT (src_object), NULL); + g_return_val_if_fail (G_IS_OBJECT (dst_object), NULL); + + src_pspec = g_object_class_find_property ( + G_OBJECT_GET_CLASS (src_object), src_property); + dst_pspec = g_object_class_find_property ( + G_OBJECT_GET_CLASS (dst_object), dst_property); + + if (transform == NULL) + transform = (EBindingTransform) g_value_transform; + + e_bind_properties_transfer ( + src_object, src_pspec, + dst_object, dst_pspec, + transform, user_data); + + binding = g_slice_new (EBinding); + binding->src_object = src_object; + binding->base.destroy = destroy_notify; + + e_binding_link_init ( + &binding->link, src_object, src_property, dst_object, + dst_pspec, transform, e_binding_on_disconnect, user_data); + + g_object_weak_ref ( + dst_object, e_binding_on_dst_object_destroy, binding); + + return binding; +} + +/** + * e_binding_new_with_negation: + * @src_object: The source #GObject. + * @src_property: The name of the property to bind from. + * @dst_object: The destination #GObject. + * @dst_property: The name of the property to bind to. + * + * Convenience function for binding with boolean negation of value. + * + * Return: The descriptor of the binding. It is automatically + * removed if one of the objects is finalized. + **/ +EBinding * +e_binding_new_with_negation (GObject *src_object, + const gchar *src_property, + GObject *dst_object, + const gchar *dst_property) +{ + EBindingTransform transform; + + transform = (EBindingTransform) e_binding_transform_negate; + + return e_binding_new_full ( + src_object, src_property, + dst_object, dst_property, + transform, NULL, NULL); +} + +/** + * e_binding_unbind: + * @binding: An #EBinding to unbind. + * + * Disconnects the binding between two properties. Should be + * rarely used by applications. + * + * This functions also calls the @destroy_notify function that + * was specified when @binding was created. + **/ +void +e_binding_unbind (EBinding *binding) +{ + g_signal_handler_disconnect ( + binding->src_object, binding->link.handler); +} + +/** + * e_mutual_binding_new: + * @object1 : The first #GObject. + * @property1: The first property to bind. + * @object2 : The second #GObject. + * @property2: The second property to bind. + * + * Mutually binds values of two properties. + * + * Before binding the value of @property2 is set to the value + * of @property1. + * + * Returns: The descriptor of the binding. It is automatically + * removed if one of the objects is finalized. + **/ +EMutualBinding * +e_mutual_binding_new (GObject *object1, + const gchar *property1, + GObject *object2, + const gchar *property2) +{ + return e_mutual_binding_new_full ( + object1, property1, + object2, property2, + NULL, NULL, NULL, NULL); +} + +/** + * e_mutual_binding_new_full: + * @object1: The first #GObject. + * @property1: The first property to bind. + * @object2: The second #GObject. + * @property2: The second property to bind. + * @transform: Transformation function or %NULL. + * @reverse_transform: The inverse transformation function or %NULL. + * @destroy_notify: Callback function called on disconnection with + * @user_data as argument or %NULL. + * @user_data: User data associated with the binding. + * + * Mutually binds values of two properties. + * + * Before binding the value of @property2 is set to the value of + * @property1. + * + * Both @transform and @reverse_transform should simultaneously be + * %NULL or non-%NULL. If they are non-%NULL, they should be reverse + * in each other. + * + * Returns: The descriptor of the binding. It is automatically + * removed if one of the objects is finalized. + **/ +EMutualBinding * +e_mutual_binding_new_full (GObject *object1, + const gchar *property1, + GObject *object2, + const gchar *property2, + EBindingTransform transform, + EBindingTransform reverse_transform, + GDestroyNotify destroy_notify, + gpointer user_data) +{ + EMutualBinding *binding; + GParamSpec *pspec1; + GParamSpec *pspec2; + + g_return_val_if_fail (G_IS_OBJECT (object1), NULL); + g_return_val_if_fail (G_IS_OBJECT (object2), NULL); + + pspec1 = g_object_class_find_property ( + G_OBJECT_GET_CLASS (object1), property1); + pspec2 = g_object_class_find_property ( + G_OBJECT_GET_CLASS (object2), property2); + + if (transform == NULL) + transform = (EBindingTransform) g_value_transform; + + if (reverse_transform == NULL) + reverse_transform = (EBindingTransform) g_value_transform; + + e_bind_properties_transfer ( + object1, pspec1, object2, + pspec2, transform, user_data); + + binding = g_slice_new (EMutualBinding); + binding->base.destroy = destroy_notify; + + e_binding_link_init ( + &binding->direct, + object1, property1, object2, pspec2, transform, + e_mutual_binding_on_disconnect_object1, user_data); + + e_binding_link_init ( + &binding->reverse, + object2, property2, object1, pspec1, reverse_transform, + e_mutual_binding_on_disconnect_object2, user_data); + + /* Tell each link about the reverse link for mutual bindings, + * to make sure that we do not ever recurse in notify (yeah, + * the GObject notify dispatching is really weird!). */ + binding->direct.dst_handler = binding->reverse.handler; + binding->reverse.dst_handler = binding->direct.handler; + + return binding; +} + +/** + * e_mutual_binding_new_with_negation: + * @object1: The first #GObject. + * @property1: The first property to bind. + * @object2: The second #GObject. + * @property2: The second property to bind. + * + * Convenience function for binding with boolean negation of value. + * + * Returns: The descriptor of the binding. It is automatically removed + * if one of the objects if finalized. + **/ +EMutualBinding* +e_mutual_binding_new_with_negation (GObject *object1, + const gchar *property1, + GObject *object2, + const gchar *property2) +{ + EBindingTransform transform; + + transform = (EBindingTransform) e_binding_transform_negate; + + return e_mutual_binding_new_full ( + object1, property1, + object2, property2, + transform, transform, + NULL, NULL); +} + +/** + * e_mutual_binding_unbind: + * @binding: An #EMutualBinding to unbind. + * + * Disconnects the binding between two properties. Should be + * rarely used by applications. + * + * This functions also calls the @destroy_notify function that + * was specified when @binding was created. + **/ +void +e_mutual_binding_unbind (EMutualBinding *binding) +{ + g_signal_handler_disconnect ( + binding->reverse.dst_object, binding->direct.handler); +} + +/** + * e_binding_transform_color_to_string: + * @src_value: a #GValue of type #GDK_TYPE_COLOR + * @dst_value: a #GValue of type #G_TYPE_STRING + * @user_data: not used + * + * Transforms a #GdkColor value to a color string specification. + * + * Returns: %TRUE always + **/ +gboolean +e_binding_transform_color_to_string (const GValue *src_value, + GValue *dst_value, + gpointer user_data) +{ + const GdkColor *color; + gchar *string; + + color = g_value_get_boxed (src_value); + string = gdk_color_to_string (color); + g_value_set_string (dst_value, string); + g_free (string); + + return TRUE; +} + +/** + * e_binding_transform_string_to_color: + * @src_value: a #GValue of type #G_TYPE_STRING + * @dst_value: a #GValue of type #GDK_TYPE_COLOR + * @user_data: not used + * + * Transforms a color string specification to a #GdkColor. + * + * Returns: %TRUE if color string specification was valid + **/ +gboolean +e_binding_transform_string_to_color (const GValue *src_value, + GValue *dst_value, + gpointer user_data) +{ + GdkColor color; + const gchar *string; + gboolean success = FALSE; + + string = g_value_get_string (src_value); + if (gdk_color_parse (string, &color)) { + g_value_set_boxed (dst_value, &color); + success = TRUE; + } + + return success; +} diff --git a/e-util/e-binding.h b/e-util/e-binding.h new file mode 100644 index 0000000000..676093bfad --- /dev/null +++ b/e-util/e-binding.h @@ -0,0 +1,118 @@ +/* + * e-binding.h + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ + +/* This is a direct rip-off of Xfce's excellent ExoBinding API, + * which binds two GObject properties together. ExoBinding was + * written by Benedikt Meurer . */ + +#ifndef E_BINDING_H +#define E_BINDING_H + +#include + +G_BEGIN_DECLS + +typedef struct _EBinding EBinding; +typedef struct _EBindingBase EBindingBase; +typedef struct _EBindingLink EBindingLink; +typedef struct _EMutualBinding EMutualBinding; + +typedef gboolean (*EBindingTransform) (const GValue *src_value, + GValue *dst_value, + gpointer user_data); + +struct _EBindingBase { + GDestroyNotify destroy; +}; + +struct _EBindingLink { + GObject *dst_object; + GParamSpec *dst_pspec; + gulong dst_handler; /* only set for mutual bindings */ + gulong handler; + EBindingTransform transform; + gpointer user_data; +}; + +struct _EBinding { + /*< private >*/ + GObject *src_object; + EBindingBase base; + EBindingLink link; +}; + +struct _EMutualBinding { + /*< private >*/ + EBindingBase base; + EBindingLink direct; + EBindingLink reverse; +}; + +EBinding * e_binding_new (GObject *src_object, + const gchar *src_property, + GObject *dst_object, + const gchar *dst_property); +EBinding * e_binding_new_full (GObject *src_object, + const gchar *src_property, + GObject *dst_object, + const gchar *dst_property, + EBindingTransform transform, + GDestroyNotify destroy_notify, + gpointer user_data); +EBinding * e_binding_new_with_negation (GObject *src_object, + const gchar *src_property, + GObject *dst_object, + const gchar *dst_property); +void e_binding_unbind (EBinding *binding); + +EMutualBinding *e_mutual_binding_new (GObject *object1, + const gchar *property1, + GObject *object2, + const gchar *property2); +EMutualBinding *e_mutual_binding_new_full (GObject *object1, + const gchar *property1, + GObject *object2, + const gchar *property2, + EBindingTransform transform, + EBindingTransform reverse_transform, + GDestroyNotify destroy_notify, + gpointer user_data); +EMutualBinding *e_mutual_binding_new_with_negation + (GObject *object1, + const gchar *property1, + GObject *object2, + const gchar *property2); +void e_mutual_binding_unbind (EMutualBinding *binding); + + +/* Useful transformation functions */ +gboolean e_binding_transform_color_to_string + (const GValue *src_value, + GValue *dst_value, + gpointer user_data); +gboolean e_binding_transform_string_to_color + (const GValue *src_value, + GValue *dst_value, + gpointer user_data); + +G_END_DECLS + +#endif /* E_BINDING_H */ -- cgit v1.2.3 From 8a072ffc7c0ddcde472877a51ace0bb14f86fb0a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 24 Apr 2009 11:45:21 +0200 Subject: GN-bug #572348 - Removed deprecated Gtk+ symbols Some still left, because those gone in kill-bonobo branch. --- e-util/ChangeLog | 11 +++++ e-util/e-config.c | 6 +-- e-util/e-cursor.c | 4 +- e-util/e-dialog-utils.c | 8 ++-- e-util/e-dialog-widgets.c | 109 ---------------------------------------------- e-util/e-dialog-widgets.h | 3 -- 6 files changed, 20 insertions(+), 121 deletions(-) (limited to 'e-util') diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 4b29efd710..69db24d87d 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,14 @@ +2009-04-24 Milan Crha + + ** Fix for bug #572348 + + * e-config.c: + * e-cursor.c: + * e-dialog-utils.c: + * e-dialog-widgets.h: + * e-dialog-widgets.c: + Remove deprecated Gtk+ symbols. + 2009-04-07 Tobias Mueller ** Fixes bug #577989 diff --git a/e-util/e-config.c b/e-util/e-config.c index 4530d7a78b..1da54b5436 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -905,10 +905,10 @@ e_config_create_window(EConfig *emp, struct _GtkWindow *parent, const char *titl g_signal_connect(w, "response", G_CALLBACK(ec_dialog_response), emp); gtk_widget_ensure_style (w); - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (w)->vbox), 0); - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (w)->action_area), 12); + gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (w))), 0); + gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (w))), 12); - gtk_box_pack_start((GtkBox *)((GtkDialog *)w)->vbox, emp->widget, TRUE, TRUE, 0); + gtk_box_pack_start((GtkBox *)gtk_dialog_get_content_area (((GtkDialog *)w)), emp->widget, TRUE, TRUE, 0); } else { /* response is handled directly by the druid stuff */ w = gtk_window_new(GTK_WINDOW_TOPLEVEL); diff --git a/e-util/e-cursor.c b/e-util/e-cursor.c index 97e3989f9b..7d547e38ac 100644 --- a/e-util/e-cursor.c +++ b/e-util/e-cursor.c @@ -47,7 +47,7 @@ void e_cursor_set (GtkWidget *widget, ECursorType cursor) GdkCursor *window_cursor; toplevel = gtk_widget_get_toplevel (widget); - if (GTK_WIDGET_TOPLEVEL (toplevel) && toplevel->window) { + if (GTK_WIDGET_TOPLEVEL (toplevel) && gtk_widget_get_window (GTK_WIDGET (toplevel))) { switch (cursor) { case E_CURSOR_NORMAL : @@ -61,7 +61,7 @@ void e_cursor_set (GtkWidget *widget, ECursorType cursor) window_cursor = gdk_cursor_new (GDK_LEFT_PTR); } - gdk_window_set_cursor (toplevel->window, window_cursor); + gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (toplevel)), window_cursor); gdk_cursor_unref (window_cursor); } diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index a3bde484d5..0546430512 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -178,8 +178,8 @@ e_dialog_set_transient_for (GtkWindow *dialog, } #ifdef GDK_WINDOWING_X11 /* Find the top-level windowmanager-managed X Window */ - display = GDK_WINDOW_XDISPLAY (parent_widget->window); - parent = GDK_WINDOW_XID (parent_widget->window); + display = GDK_WINDOW_XDISPLAY (gtk_widget_get_window (parent_widget)); + parent = GDK_WINDOW_XID (gtk_widget_get_window (parent_widget)); while (parent && !window_is_wm_toplevel (display, parent)) { status = XQueryTree (display, parent, &root_ret, @@ -228,7 +228,7 @@ e_dialog_set_transient_for_xid (GtkWindow *dialog, } #ifdef GDK_MULTIHEAD_SAFE - display = gdk_drawable_get_display (GDK_DRAWABLE (GTK_WIDGET (dialog)->window)); + display = gdk_drawable_get_display (GDK_DRAWABLE (gtk_widget_get_window (GTK_WIDGET (dialog)))); parent = gdk_window_lookup_for_display (display, xid); if (!parent) parent = gdk_window_foreign_new_for_display (display, xid); @@ -239,7 +239,7 @@ e_dialog_set_transient_for_xid (GtkWindow *dialog, #endif g_return_if_fail (parent != NULL); - gdk_window_set_transient_for (GTK_WIDGET (dialog)->window, parent); + gdk_window_set_transient_for (gtk_widget_get_window (GTK_WIDGET (dialog)), parent); } diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c index d3987b07bc..afe50a85b4 100644 --- a/e-util/e-dialog-widgets.c +++ b/e-util/e-dialog-widgets.c @@ -139,34 +139,6 @@ get_radio_value (GtkRadioButton *radio, gpointer value_var, gpointer info) *value = e_dialog_radio_get (GTK_WIDGET (radio), value_map); } -/* Hooks an option menu */ -static void -hook_option_menu (GtkWidget *dialog, GtkOptionMenu *omenu, gpointer value_var, gpointer info) -{ - const int *value_map; - int *value; - - /* Set the value */ - - value = (int *) value_var; - value_map = (const int *) info; - - e_dialog_option_menu_set (GTK_WIDGET (omenu), *value, value_map); -} - -/* Gets the value of an option menu */ -static void -get_option_menu_value (GtkOptionMenu *omenu, gpointer value_var, gpointer info) -{ - const int *value_map; - int *value; - - value = (int *) value_var; - value_map = (const int *) info; - - *value = e_dialog_option_menu_get (GTK_WIDGET (omenu), value_map); -} - /* Hooks a toggle button */ static void hook_toggle (GtkWidget *dialog, GtkToggleButton *toggle, gpointer value_var, gpointer info) @@ -469,83 +441,6 @@ e_dialog_spin_get_int (GtkWidget *widget) return (int) floor (value); } -/** - * e_dialog_option_menu_set: - * @widget: A #GtkOptionMenu. - * @value: Enumerated value. - * @value_map: Map from enumeration values to array indices. - * - * Sets the selected item in a #GtkOptionMenu. Please read the description of - * e_dialog_radio_set() to see how @value_map maps enumeration values to item - * indices. - **/ -void -e_dialog_option_menu_set (GtkWidget *widget, int value, const int *value_map) -{ - int i; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_OPTION_MENU (widget)); - g_return_if_fail (value_map != NULL); - - i = value_to_index (value_map, value); - - if (i != -1) - gtk_option_menu_set_history (GTK_OPTION_MENU (widget), i); - else - g_message ("e_dialog_option_menu_set(): could not find value %d in value map!", - value); -} - -/** - * e_dialog_option_menu_get: - * @widget: A #GtkOptionMenu. - * @value_map: Map from enumeration values to array indices. - * - * Queries the selected item in a #GtkOptionMenu. Please read the description - * of e_dialog_radio_set() to see how @value_map maps enumeration values to item - * indices. - * - * Return value: Enumeration value which corresponds to the selected item in the - * option menu. - **/ -int -e_dialog_option_menu_get (GtkWidget *widget, const int *value_map) -{ - GtkMenu *menu; - GtkWidget *active; - GList *children; - GList *l; - int i; - int v; - - g_return_val_if_fail (widget != NULL, -1); - g_return_val_if_fail (GTK_IS_OPTION_MENU (widget), -1); - g_return_val_if_fail (value_map != NULL, -1); - - menu = GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (widget))); - - active = gtk_menu_get_active (menu); - g_return_val_if_fail (active != NULL, -1); - - children = GTK_MENU_SHELL (menu)->children; - - for (i = 0, l = children; l; l = l->next, i++) { - if (GTK_WIDGET (l->data) == active) - break; - } - - g_return_val_if_fail (l != NULL, -1); - - v = index_to_value (value_map, i); - if (v == -1) { - g_message ("e_dialog_option_menu_get(): could not find index %d in value map!", i); - return -1; - } - - return v; -} - /** * e_dialog_combo_box_set: * @widget: A #GtkComboBox. @@ -681,8 +576,6 @@ e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget, if (GTK_IS_RADIO_BUTTON (widget)) hook_radio (dialog, GTK_RADIO_BUTTON (widget), value_var, info); - else if (GTK_IS_OPTION_MENU (widget)) - hook_option_menu (dialog, GTK_OPTION_MENU (widget), value_var, info); else if (GTK_IS_TOGGLE_BUTTON (widget)) hook_toggle (dialog, GTK_TOGGLE_BUTTON (widget), value_var, info); else if (GTK_IS_SPIN_BUTTON (widget)) @@ -729,8 +622,6 @@ e_dialog_get_values (GtkWidget *dialog) if (GTK_IS_RADIO_BUTTON (wh->widget)) get_radio_value (GTK_RADIO_BUTTON (wh->widget), wh->value_var, wh->info); - else if (GTK_IS_OPTION_MENU (wh->widget)) - get_option_menu_value (GTK_OPTION_MENU (wh->widget), wh->value_var, wh->info); else if (GTK_IS_TOGGLE_BUTTON (wh->widget)) get_toggle_value (GTK_TOGGLE_BUTTON (wh->widget), wh->value_var, wh->info); else if (GTK_IS_SPIN_BUTTON (wh->widget)) diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h index 39f4b47b39..1a46c02fd3 100644 --- a/e-util/e-dialog-widgets.h +++ b/e-util/e-dialog-widgets.h @@ -43,9 +43,6 @@ void e_dialog_spin_set (GtkWidget *widget, double value); double e_dialog_spin_get_double (GtkWidget *widget); int e_dialog_spin_get_int (GtkWidget *widget); -void e_dialog_option_menu_set (GtkWidget *widget, int value, const int *value_map); -int e_dialog_option_menu_get (GtkWidget *widget, const int *value_map); - void e_dialog_combo_box_set (GtkWidget *widget, int value, const int *value_map); int e_dialog_combo_box_get (GtkWidget *widget, const int *value_map); -- cgit v1.2.3