aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-05-09 23:02:46 +0800
committerJeremy Katz <katzj@src.gnome.org>2003-05-09 23:02:46 +0800
commitf6038b72aa561d2c71369143d89d6467db567a07 (patch)
tree6fb0de174fe0ef58c3229189abff57fcef3366db
parent7b20b772d2460427ceefa7c463ed8f874762f57b (diff)
downloadgsoc2013-evolution-f6038b72aa561d2c71369143d89d6467db567a07.tar.gz
gsoc2013-evolution-f6038b72aa561d2c71369143d89d6467db567a07.tar.zst
gsoc2013-evolution-f6038b72aa561d2c71369143d89d6467db567a07.zip
Use glib macro to case from pointer to int.
2003-05-09 Jeremy Katz <katzj@redhat.com> * printing/e-contact-print.c (e_contact_print_response): Use glib macro to case from pointer to int. * printing/e-contact-print-envelope.c: Add missing #include. * gui/component/select-names/e-select-names-completion.c (e_select_names_completion_start_query): Use E_SELECT_NAMES_COMPLETION to avoid warning svn path=/trunk/; revision=21138
-rw-r--r--addressbook/ChangeLog11
-rw-r--r--addressbook/gui/component/select-names/e-select-names-completion.c2
-rw-r--r--addressbook/printing/e-contact-print-envelope.c1
-rw-r--r--addressbook/printing/e-contact-print.c2
4 files changed, 14 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index c3dc185d75..56a84db076 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,14 @@
+2003-05-09 Jeremy Katz <katzj@redhat.com>
+
+ * printing/e-contact-print.c (e_contact_print_response): Use glib
+ macro to case from pointer to int.
+
+ * printing/e-contact-print-envelope.c: Add missing #include.
+
+ * gui/component/select-names/e-select-names-completion.c
+ (e_select_names_completion_start_query): Use
+ E_SELECT_NAMES_COMPLETION to avoid warning
+
2003-05-06 Chris Toshok <toshok@ximian.com>
[ really commit this, fixes bug #41910 ]
diff --git a/addressbook/gui/component/select-names/e-select-names-completion.c b/addressbook/gui/component/select-names/e-select-names-completion.c
index eb69f33afb..5a9fc2deb4 100644
--- a/addressbook/gui/component/select-names/e-select-names-completion.c
+++ b/addressbook/gui/component/select-names/e-select-names-completion.c
@@ -995,7 +995,7 @@ e_select_names_completion_start_query (ESelectNamesCompletion *comp, const gchar
solely on our cached cards, signal
that the search is over. */
if (!comp->priv->pending_completion_seq)
- e_select_names_completion_done (E_COMPLETION (comp));
+ e_select_names_completion_done (E_SELECT_NAMES_COMPLETION (comp));
} else {
g_free (comp->priv->query_text);
comp->priv->query_text = NULL;
diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c
index 5ed3fb8211..33e7361605 100644
--- a/addressbook/printing/e-contact-print-envelope.c
+++ b/addressbook/printing/e-contact-print-envelope.c
@@ -28,6 +28,7 @@
#include <libgnomeprintui/gnome-print-dialog.h>
#include <libgnomeprint/gnome-print.h>
#include <libgnomeprint/gnome-print-job.h>
+#include <libgnomeprintui/gnome-print-job-preview.h>
#include "addressbook/backend/ebook/e-card.h"
#include "addressbook/backend/ebook/e-card-simple.h"
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index e3f79099bb..04a3523c56 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -1014,7 +1014,7 @@ e_contact_print_response(GtkWidget *dialog, gint response_id, gpointer data)
GnomePrintJob *master;
GnomePrintConfig *config;
GnomePrintContext *pc;
- gboolean uses_book = (gint) g_object_get_data(G_OBJECT(dialog), "uses_book");
+ gboolean uses_book = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(dialog), "uses_book"));
EBook *book = NULL;
char *query = NULL;
ECard *card = NULL;