aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/ChangeLog22
-rw-r--r--e-util/e-account-list.c2
-rw-r--r--e-util/e-categories-config.c9
-rw-r--r--e-util/e-dialog-utils.c8
-rw-r--r--e-util/e-gui-utils.c1
-rw-r--r--e-util/e-util.c4
-rw-r--r--e-util/eggtrayicon.h2
7 files changed, 35 insertions, 13 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 4b8f6452fc..a08591e041 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,25 @@
+2005-08-23 Not Zed <NotZed@Ximian.com>
+
+ * e-util.c (e_mkdir_hier): cast warning, good ol win32 patches.
+ (e_strftime): fix some clahey-code to use the right variable and
+ not try to modify const strings by stealth.
+
+ * eggtrayicon.h: add missing prototype.
+
+ * e-gui-utils.c (e_create_image_widget): remove unused pixbuf.
+
+ * e-dialog-utils.c (dialog_realized): fix cast.
+ (e_dialog_set_transient_for_xid): same.
+ (e_file_dialog_save): fix cases for build.
+
+ * e-categories-config.c
+ (e_categories_config_open_dialog_for_entry): cast & use right type
+ for text.
+ (icons_table[]): remove unused.
+
+ * e-account-list.c (e_account_list_remove_account_proxies): cast
+ to fix warning.
+
2005-08-18 David Malcolm <dmalcolm@redhat.com>
* e-plugin.c (ep_set_enabled): Fix compiler warning on early bailout
diff --git a/e-util/e-account-list.c b/e-util/e-account-list.c
index bc17e9a203..29d0183c19 100644
--- a/e-util/e-account-list.c
+++ b/e-util/e-account-list.c
@@ -316,7 +316,7 @@ e_account_list_remove_account_proxies (EAccountList *accounts, EAccount *account
{
EAccount *child_account;
- while ( (child_account = e_account_list_find (accounts, E_ACCOUNT_FIND_PARENT_UID, account->uid))) {
+ while ( (child_account = (EAccount *)e_account_list_find (accounts, E_ACCOUNT_FIND_PARENT_UID, account->uid))) {
e_account_list_remove (accounts, child_account);
child_account = NULL;
}
diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c
index af5961ef5d..eaf5510c72 100644
--- a/e-util/e-categories-config.c
+++ b/e-util/e-categories-config.c
@@ -16,8 +16,6 @@
#include <libedataserverui/e-categories-dialog.h>
#include "e-categories-config.h"
-static GHashTable *icons_table = NULL;
-
/**
* e_categories_config_get_icon_for:
* @category: Category for which to get the icon.
@@ -78,7 +76,6 @@ e_categories_config_open_dialog_for_entry (GtkEntry *entry)
{
GtkDialog *dialog;
const char *text;
- char *categories;
int result;
g_return_if_fail (entry != NULL);
@@ -87,14 +84,14 @@ e_categories_config_open_dialog_for_entry (GtkEntry *entry)
text = gtk_entry_get_text (GTK_ENTRY (entry));
dialog = GTK_DIALOG (e_categories_dialog_new (text));
- gtk_window_set_transient_for (GTK_WINDOW (dialog), gtk_widget_get_toplevel (GTK_WIDGET (entry)));
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW(gtk_widget_get_toplevel (GTK_WIDGET (entry))));
/* run the dialog */
result = gtk_dialog_run (dialog);
if (result == GTK_RESPONSE_OK) {
- categories = e_categories_dialog_get_categories (E_CATEGORIES_DIALOG (dialog));
- gtk_entry_set_text (GTK_ENTRY (entry), categories);
+ text = e_categories_dialog_get_categories (E_CATEGORIES_DIALOG (dialog));
+ gtk_entry_set_text (GTK_ENTRY (entry), text);
}
gtk_object_destroy (GTK_OBJECT (dialog));
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index 63d3f1d74c..716bd71f8d 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -197,7 +197,7 @@ e_dialog_set_transient_for (GtkWindow *dialog,
static void
dialog_realized (GtkWindow *dialog, gpointer xid)
{
- e_dialog_set_transient_for_xid (dialog, (GdkNativeWindow)xid);
+ e_dialog_set_transient_for_xid (dialog, (GdkNativeWindow)GPOINTER_TO_INT(xid));
}
/**
@@ -222,7 +222,7 @@ e_dialog_set_transient_for_xid (GtkWindow *dialog,
if (!GTK_WIDGET_REALIZED (dialog)) {
g_signal_connect (dialog, "realize",
G_CALLBACK (dialog_realized),
- (gpointer) xid);
+ GINT_TO_POINTER(xid));
return;
}
@@ -294,7 +294,7 @@ char *
e_file_dialog_save (const char *title)
{
GtkWidget *selection;
- char *path, *filename = NULL;
+ char *filename = NULL;
#ifdef USE_GTKFILECHOOSER
selection = gtk_file_chooser_dialog_new (title,
@@ -308,6 +308,8 @@ e_file_dialog_save (const char *title)
g_signal_connect (G_OBJECT (selection), "response", G_CALLBACK (filechooser_response), &filename);
#else
+ char *path;
+
selection = gtk_file_selection_new (title);
path = g_strdup_printf ("%s/", g_get_home_dir ());
gtk_file_selection_set_filename (GTK_FILE_SELECTION (selection), path);
diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c
index 3e8849fe93..919ad860bb 100644
--- a/e-util/e-gui-utils.c
+++ b/e-util/e-gui-utils.c
@@ -36,7 +36,6 @@ GtkWidget *e_create_image_widget(gchar *name,
gint int1, gint int2)
{
GtkWidget *alignment = NULL;
- GdkPixbuf *pixbuf;
GtkWidget *w;
if (string1) {
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 28f2596583..7a9f81d81b 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -272,7 +272,7 @@ e_mkdir_hier(const char *path, mode_t mode)
g_free (current_dir);
}
- p = g_path_skip_root (p);
+ p = (char *)g_path_skip_root (p);
do {
char *p1 = strchr (p, '/');
#ifdef G_OS_WIN32
@@ -774,7 +774,7 @@ size_t e_strftime(char *s, size_t max, const char *fmt, const struct tm *tm)
ff = c;
}
- ff = fmt;
+ ff = ffmt;
while ((c = strstr(ff, "%k")) != NULL) {
c[1] = 'H';
ff = c;
diff --git a/e-util/eggtrayicon.h b/e-util/eggtrayicon.h
index 007f4c18e9..e467894e34 100644
--- a/e-util/eggtrayicon.h
+++ b/e-util/eggtrayicon.h
@@ -58,6 +58,8 @@ struct _EggTrayIconClass
GType egg_tray_icon_get_type (void);
+EggTrayIcon *egg_tray_icon_new_for_xscreen (Screen *xscreen, const char *name);
+
EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen *screen,
const gchar *name);