aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/gui/gnome-cal.c12
-rw-r--r--plugins/profiler/profiler.c4
-rw-r--r--shell/e-shell.c4
3 files changed, 5 insertions, 15 deletions
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index defda15875..690c7003b1 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1337,15 +1337,6 @@ static void
setup_widgets (GnomeCalendar *gcal)
{
GnomeCalendarPrivate *priv;
- GtkWidget *w, *sep;
- gchar *filename;
- ETable *etable;
- GtkAdjustment *adjustment;
- GtkWidget *vbox;
- GtkWidget *label;
- ECalModel *cal_model;
- gint i;
- gchar *tmp;
priv = gcal->priv;
@@ -1402,7 +1393,6 @@ gnome_calendar_destroy (GtkObject *object)
{
GnomeCalendar *gcal;
GnomeCalendarPrivate *priv;
- gchar *filename;
g_return_if_fail (object != NULL);
g_return_if_fail (GNOME_IS_CALENDAR (object));
@@ -1412,7 +1402,6 @@ gnome_calendar_destroy (GtkObject *object)
if (priv) {
GList *l;
- gint i;
if (priv->shell_settings != NULL) {
g_object_unref (priv->shell_settings);
@@ -1756,7 +1745,6 @@ void
gnome_calendar_display_view (GnomeCalendar *gcal,
GnomeCalendarViewType view_type)
{
- CalendarView *cal_view;
ECalendarView *view;
gboolean preserve_day;
gboolean range_selected;
diff --git a/plugins/profiler/profiler.c b/plugins/profiler/profiler.c
index 1200661b51..b57ba83817 100644
--- a/plugins/profiler/profiler.c
+++ b/plugins/profiler/profiler.c
@@ -32,6 +32,8 @@
#include <glib.h>
#include <e-util/e-profile-event.h>
+void org_gnome_evolution_profiler_event (EPlugin *ep, EProfileEventTarget *t);
+
void
org_gnome_evolution_profiler_event(EPlugin *ep, EProfileEventTarget *t)
{
@@ -48,5 +50,5 @@ org_gnome_evolution_profiler_event(EPlugin *ep, EProfileEventTarget *t)
}
if (fp)
- fprintf(fp, "%d.%d: %s,%s\n", t->tv.tv_sec, t->tv.tv_usec, t->id, t->uid);
+ fprintf(fp, "%d.%d: %s,%s\n", (gint) t->tv.tv_sec, (gint) t->tv.tv_usec, t->id, t->uid);
}
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 4dd72e3747..75b66555fc 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -90,7 +90,7 @@ EShell *default_shell = NULL;
static gpointer parent_class;
static guint signals[LAST_SIGNAL];
-#if NM_SUPPORT
+#if defined(NM_SUPPORT) && NM_SUPPORT
gboolean e_shell_dbus_initialize (EShell *shell);
#endif
@@ -953,7 +953,7 @@ shell_init (EShell *shell)
g_object_ref_sink (shell->priv->preferences_window);
-#if NM_SUPPORT
+#if defined(NM_SUPPORT) && NM_SUPPORT
e_shell_dbus_initialize (shell);
#endif