callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

** Fix for bug #386503 from Matthew Barnes

Browse Source 
svn path=/trunk/; revision=33647
This commit is contained in:
Srinivasa Ragavan
2007-06-03 15:07:55 +00:00
parent 54a9260f69
commit 8bebb05056
14 changed files with 95 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
addressbook/ChangeLog
View File

@ -1,3 +1,9 @@
2007-06-03 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #386503 from Matthew Barnes
* gui/contact-editor/e-contact-editor.c: (show_help_cb):
2007-06-03 Srinivasa Ragavan <sragavan@novell.com>
** Fix for version removal from Installed files from Gilles Dartiguelongue

11
addressbook/gui/contact-editor/e-contact-editor.c
View File

@ -3228,13 +3228,12 @@ show_help_cb (GtkWidget *widget, gpointer data)
{
GError *error = NULL;
gnome_help_display_desktop (NULL,
"evolution-" BASE_VERSION,
"evolution-" BASE_VERSION ".xml",
"usage-contact-cards",
&error);
if (error != NULL)
gnome_help_display (
"evolution.xml", "usage-contact-cards", &error);
if (error != NULL) {
g_warning ("%s", error->message);
g_error_free (error);
}
}
static GList *

6
calendar/ChangeLog
View File

@ -1,3 +1,9 @@
2007-06-03 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #386503 from Matthew Barnes
* gui/dialogs/comp-editor.c: (comp_editor_show_help):
2007-06-03 Srinivasa Ragavan <sragavan@novell.com>
** Fix for version removal from Installed files from Gilles Dartiguelongue

11
calendar/gui/dialogs/comp-editor.c
View File

@ -1695,13 +1695,12 @@ comp_editor_show_help (CompEditor *editor)
priv = editor->priv;
gnome_help_display_desktop (NULL,
"evolution-" BASE_VERSION,
"evolution-" BASE_VERSION ".xml",
priv->help_section,
&error);
if (error != NULL)
gnome_help_display (
"evolution.xml", priv->help_section, &error);
if (error != NULL) {
g_warning ("%s", error->message);
g_error_free (error);
}
}

6
composer/ChangeLog
View File

@ -1,3 +1,9 @@
2007-06-03 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #386503 from Matthew Barnes
* e-msg-composer.c: (e_msg_composer_show_help):
2007-06-01 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #315012 from Pascal Terjan

11
composer/e-msg-composer.c
View File

@ -2879,13 +2879,12 @@ e_msg_composer_show_help (EMsgComposer *composer)
{
GError *error = NULL;
gnome_help_display_desktop (NULL,
"evolution-" BASE_VERSION,
"evolution-" BASE_VERSION ".xml",
"usage-composer",
&error);
if (error != NULL)
gnome_help_display (
"evolution.xml", "usage-composer", &error);
if (error != NULL) {
g_warning ("%s", error->message);
g_error_free (error);
}
}

6
plugins/exchange-operations/ChangeLog
View File

@ -1,3 +1,9 @@
2007-06-03 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #386503 from Matthew Barnes
* exchange-send-options.c: (exchange_send_options_cb):
2007-05-25 Matthew Barnes <mbarnes@redhat.com>
* exchange-config-listener.c (exchange_add_autocompletion_folders):

25
plugins/exchange-operations/exchange-send-options.c
View File

@ -191,21 +191,20 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu
switch (state) {
case GTK_RESPONSE_OK:
exchange_send_options_get_widgets_data (sod);
exchange_send_options_get_widgets_data (sod);
case GTK_RESPONSE_CANCEL:
gtk_widget_hide (priv->main);
gtk_widget_destroy (priv->main);
g_object_unref (priv->xml);
break;
gtk_widget_hide (priv->main);
gtk_widget_destroy (priv->main);
g_object_unref (priv->xml);
break;
case GTK_RESPONSE_HELP:
gnome_help_display_desktop (NULL,
"evolution-" BASE_VERSION,
"evolution-" BASE_VERSION ".xml",
priv->help_section,
&error);
if (error != NULL)
g_warning ("%s", error->message);
break;
gnome_help_display (
"evolution.xml", priv->help_section, &error);
if (error != NULL) {
g_warning ("%s", error->message);
g_error_free (error);
}
break;
}
g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);

7
shell/ChangeLog
View File

@ -1,3 +1,10 @@
2007-06-03 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #386503 from Matthew Barnes
* e-shell-window.c: (e_shell_window_new):
* main.c: (main):
2007-06-03 Srinivasa Ragavan <sragavan@novell.com>
** Fix for version removal from Installed files from Gilles Dartiguelongue

2
shell/e-shell-window.c
View File

@ -1066,7 +1066,7 @@ e_shell_window_new (EShell *shell,
bonobo_ui_util_set_ui (priv->ui_component,
PREFIX,
xmlfile,
"evolution-" BASE_VERSION, NULL);
"evolution", NULL);
g_free (xmlfile);
e_shell_window_commands_setup (window);

2
shell/main.c
View File

@ -502,7 +502,7 @@ main (int argc, char **argv)
g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv,
program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv,
GNOME_PROGRAM_STANDARD_PROPERTIES,
GNOME_PARAM_GOPTION_CONTEXT, context,
GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"),

7
widgets/misc/ChangeLog
View File

@ -1,3 +1,10 @@
2007-06-03 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #386503 from Matthew Barnes
* e-multi-config-dialog.c: (impl_response):
* e-send-options.c: (e_send_options_cb):
2007-06-03 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #416031 from Martin Jürgens

11
widgets/misc/e-multi-config-dialog.c
View File

@ -193,13 +193,12 @@ impl_response (GtkDialog *dialog, int response_id)
switch (response_id) {
case GTK_RESPONSE_HELP:
gnome_help_display_desktop (NULL,
"evolution-" BASE_VERSION,
"evolution-" BASE_VERSION ".xml",
"config-prefs",
&error);
if (error != NULL)
gnome_help_display (
"evolution.xml", "config-prefs", &error);
if (error != NULL) {
g_warning ("%s", error->message);
g_error_free (error);
}
break;
case GTK_RESPONSE_CLOSE:
default:

48
widgets/misc/e-send-options.c
View File

@ -588,34 +588,32 @@ e_sendoptions_set_global (ESendOptionsDialog *sod, gboolean set)
static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
{
ESendOptionsDialogPrivate *priv;
ESendOptionsDialog *sod;
GError *error = NULL;
ESendOptionsDialogPrivate *priv;
ESendOptionsDialog *sod;
GError *error = NULL;
sod = func_data;
priv = sod->priv;
sod = func_data;
priv = sod->priv;
switch (state) {
case GTK_RESPONSE_OK:
e_send_options_get_widgets_data (sod);
case GTK_RESPONSE_CANCEL:
gtk_widget_hide (priv->main);
gtk_widget_destroy (priv->main);
g_object_unref (priv->xml);
break;
case GTK_RESPONSE_HELP:
gnome_help_display_desktop (NULL,
"evolution-" BASE_VERSION,
"evolution-" BASE_VERSION ".xml",
priv->help_section,
&error);
if (error != NULL)
g_warning ("%s", error->message);
break;
}
g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
switch (state) {
case GTK_RESPONSE_OK:
e_send_options_get_widgets_data (sod);
case GTK_RESPONSE_CANCEL:
gtk_widget_hide (priv->main);
gtk_widget_destroy (priv->main);
g_object_unref (priv->xml);
break;
case GTK_RESPONSE_HELP:
gnome_help_display (
"evolution.xml", priv->help_section, &error);
if (error != NULL) {
g_warning ("%s", error->message);
g_error_free (error);
}
break;
}
g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
}
gboolean