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

Fix an unused variable

Browse Source 
* gui/alarm-notify/alarm-queue.c (on_dialog_obj_updated_cb): Fix
	an unused variable

	* gui/calendar-commands.c (purge_cmd): Fix warnings.

	* gui/calendar-config.h: s/confirm_expunge/confirm_purge/ to match
	the actual functions

	* gui/control-factory.c: add some missing #includes

	* gui/dialogs/delete-comp.c (delete_component_dialog): Fix a
	warning

	* gui/e-itip-control.c (write_label_piece): Remove unused variable.

	* gui/print.c (print_calendar): Remove unused variable
	(print_comp): Likewise.

	* gui/tasks-control.c (confirm_purge): Fix warnings.
	(print_tasks): Remove unused variable.

svn path=/trunk/; revision=21905
This commit is contained in:
Dan Winship
2003-07-23 15:05:03 +00:00
parent c1cfb3197a
commit d5ce44bd78
9 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
calendar/ChangeLog
View File

@ -1,3 +1,26 @@
2003-07-23 Dan Winship <danw@ximian.com>
* gui/alarm-notify/alarm-queue.c (on_dialog_obj_updated_cb): Fix
an unused variable
* gui/calendar-commands.c (purge_cmd): Fix warnings.
* gui/calendar-config.h: s/confirm_expunge/confirm_purge/ to match
the actual functions
* gui/control-factory.c: add some missing #includes
* gui/dialogs/delete-comp.c (delete_component_dialog): Fix a
warning
* gui/e-itip-control.c (write_label_piece): Remove unused variable.
* gui/print.c (print_calendar): Remove unused variable
(print_comp): Likewise.
* gui/tasks-control.c (confirm_purge): Fix warnings.
(print_tasks): Remove unused variable.
2003-07-23 Rodrigo Moya <rodrigo@ximian.com>
* gui/e-day-view.h:

2
calendar/gui/alarm-notify/alarm-queue.c
View File

@ -660,7 +660,9 @@ struct notify_dialog_closure {
static void
on_dialog_obj_updated_cb (CalClient *client, const char *uid, gpointer data)
{
/* commented out so gcc won't complain about the unused variable
struct notify_dialog_closure *c = data;
*/
}
static void

5
calendar/gui/calendar-commands.c
View File

@ -35,6 +35,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtkfilesel.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkspinbutton.h>
@ -344,7 +345,7 @@ static void
purge_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
{
GnomeCalendar *gcal;
GtkWidget *dialog, *parent, *box, *label, *spin, *unit;
GtkWidget *dialog, *parent, *box, *label, *spin;
int response;
gcal = GNOME_CALENDAR (data);
@ -352,7 +353,7 @@ purge_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
/* create the dialog */
parent = gtk_widget_get_toplevel (GTK_WIDGET (gcal));
dialog = gtk_message_dialog_new (
parent,
(GtkWindow *)parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_OK_CANCEL,

4
calendar/gui/calendar-config.h
View File

@ -155,8 +155,8 @@ char* calendar_config_get_hide_completed_tasks_sexp (void);
gboolean calendar_config_get_confirm_delete (void);
void calendar_config_set_confirm_delete (gboolean confirm);
gboolean calendar_config_get_confirm_expunge (void);
void calendar_config_set_confirm_expunge (gboolean confirm);
gboolean calendar_config_get_confirm_purge (void);
void calendar_config_set_confirm_purge (gboolean confirm);
/* Default reminder options */
gboolean calendar_config_get_use_default_reminder (void);

3
calendar/gui/control-factory.c
View File

@ -21,6 +21,7 @@
*/
#include <config.h>
#include <string.h>
#include <gtk/gtksignal.h>
#include <glade/glade.h>
#include <bonobo/bonobo-control.h>
@ -29,10 +30,12 @@
#include <bonobo/bonobo-context.h>
#include <bonobo/bonobo-property-bag.h>
#include <glade/glade.h>
#include <libgnomeui/gnome-dialog-util.h>
#include <cal-util/timeutil.h>
#include <gui/gnome-cal.h>
#include <gui/calendar-commands.h>
#include <gui/calendar-config.h>
#include "control-factory.h"

2
calendar/gui/dialogs/delete-comp.c
View File

@ -150,7 +150,7 @@ delete_component_dialog (CalComponent *comp,
}
}
dialog = gtk_message_dialog_new (gtk_widget_get_toplevel (widget),
dialog = gtk_message_dialog_new ((GtkWindow *)gtk_widget_get_toplevel (widget),
0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", str);
g_free (str);
ret = gtk_dialog_run ((GtkDialog *)dialog) == GTK_RESPONSE_YES;

2
calendar/gui/e-itip-control.c
View File

@ -602,7 +602,7 @@ write_label_piece (EItipControl *itip, CalComponentDateTime *dt,
{
EItipControlPrivate *priv;
struct tm tmp_tm;
char time_buf[64], *time_utf8;
char time_buf[64];
icaltimezone *zone = NULL;
char *display_name;

4
calendar/gui/print.c
View File

@ -2417,7 +2417,7 @@ print_calendar (GnomeCalendar *gcal, gboolean preview, time_t date,
GnomePrintJob *gpm;
GnomePrintContext *pc;
int copies, collate;
double l, r, t, b, temp_d;
double l, r, t, b;
gchar *old_orientation;
g_return_if_fail (gcal != NULL);
@ -2533,7 +2533,7 @@ print_comp (CalComponent *comp, CalClient *client, gboolean preview)
GnomePrintJob *gpm;
GnomePrintContext *pc;
int copies, collate;
double l, r, t, b, temp_d;
double l, r, t, b;
g_return_if_fail (comp != NULL);
g_return_if_fail (IS_CAL_COMPONENT (comp));

6
calendar/gui/tasks-control.c
View File

@ -433,7 +433,7 @@ tasks_control_complete_cmd (BonoboUIComponent *uic,
static gboolean
confirm_purge (ETasks *tasks)
{
GtkWidget *dialog, *label, *checkbox, *parent;
GtkWidget *dialog, *checkbox, *parent;
int button;
if (!calendar_config_get_confirm_purge ())
@ -441,7 +441,7 @@ confirm_purge (ETasks *tasks)
parent = gtk_widget_get_toplevel (GTK_WIDGET (tasks));
dialog = gtk_message_dialog_new (
parent,
(GtkWindow *)parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_YES_NO,
@ -506,7 +506,7 @@ print_tasks (ETasks *tasks, gboolean preview)
ETable *etable;
GnomePrintContext *pc;
GnomePrintJob *gpm;
double l, r, t, b, page_width, page_height, left_margin, bottom_margin, temp_d;
double l, r, t, b, page_width, page_height, left_margin, bottom_margin;
if (!print_config)
print_config = gnome_print_config_default ();