[anjal] Fix warnings in mail-shell.c
- From: Srinivasa Ragavan <sragavan src gnome org>
- To: svn-commits-list gnome org
- Subject: [anjal] Fix warnings in mail-shell.c
- Date: Fri, 29 May 2009 08:00:06 -0400 (EDT)
commit df0597675b532c9be0b0537ea3a22e6f013e5dc1
Author: Srinivasa Ragavan <sragavan novell com>
Date: Fri May 29 08:18:22 2009 +0530
Fix warnings in mail-shell.c
---
src/mail-component.h | 2 +
src/mail-shell.c | 89 +++++++++++++++++++++++++------------------------
src/mail-view.h | 2 +
3 files changed, 49 insertions(+), 44 deletions(-)
diff --git a/src/mail-component.h b/src/mail-component.h
index c350b9e..40c6486 100644
--- a/src/mail-component.h
+++ b/src/mail-component.h
@@ -109,4 +109,6 @@ const char *mail_component_get_folder_uri(MailComponent *mc, enum _mail_componen
void mail_indicate_new_mail (gboolean have_new_mail);
void mail_component_show_logger (gpointer);
MailComponent * mail_component_create (GtkWidget * parent, gboolean select_item);
+gboolean mail_component_can_quit(MailComponent *mc);
+gboolean mail_component_quit(MailComponent *mc);
#endif /* _MAIL_COMPONENT_H_ */
diff --git a/src/mail-shell.c b/src/mail-shell.c
index 003514a..3460b00 100644
--- a/src/mail-shell.c
+++ b/src/mail-shell.c
@@ -31,6 +31,8 @@
#include "mail-component.h"
#include <gdk/gdkkeysyms.h>
#include <misc/e-spinner.h>
+#include "mail-decoration.h"
+
enum {
BACKSPACE_PRESSED,
SLASH_PRESSED,
@@ -98,7 +100,7 @@ ms_backspace_pressed (MailShell *shell)
gtk_widget_hide (priv->slider);
gtk_widget_show (shell->priv->folder_pane);
- mail_view_show_list (shell->mail_component->mail_view);
+ mail_view_show_list ((MailView *)shell->mail_component->mail_view);
}
static void
@@ -149,7 +151,6 @@ color_expose (GtkWidget *w, GdkEventExpose *event, gpointer data)
cairo_t *cr = gdk_cairo_create (w->window);
int wid = w->allocation.width;
int heig = w->allocation.height;
- GtkStyle *style = gtk_widget_get_default_style ();
GdkColor paint;
gdk_color_parse ("#000000", &paint);
@@ -165,43 +166,43 @@ color_expose (GtkWidget *w, GdkEventExpose *event, gpointer data)
static void
popup_sort (GtkButton *b, MailShell *shell)
{
- mail_view_show_sort_popup (shell->mail_component->mail_view, b);
+ mail_view_show_sort_popup ((MailView *)shell->mail_component->mail_view, (GtkWidget *)b);
}
static void
new_email_btn_clicked (GtkButton *button, gpointer data)
{
MailShell *shell = (MailShell *) data;
- MailView *view = shell->mail_component->mail_view;
+ MailView *view = (MailView *)shell->mail_component->mail_view;
- mail_view_add_page (view, MAIL_VIEW_COMPOSER);
+ mail_view_add_page ((MailView *)view, MAIL_VIEW_COMPOSER);
}
MailViewChild *
mail_shell_create_composer (void)
{
MailComponent *mc = mail_component_peek ();
- MailView *view = mc->mail_view;
+ MailView *view = (MailView *)mc->mail_view;
- return mail_view_add_page (view, MAIL_VIEW_COMPOSER);
+ return mail_view_add_page ((MailView *)view, MAIL_VIEW_COMPOSER);
}
static void
ms_check_mail (GtkButton *button, gpointer data)
{
MailShell *shell = (MailShell *) data;
- MailView *view = shell->mail_component->mail_view;
+ MailView *view = (MailView *)shell->mail_component->mail_view;
- mail_view_check_mail (view);
+ mail_view_check_mail ((MailView *)view);
}
static void
settings_btn_clicked (GtkButton *button, gpointer data)
{
MailShell *shell = (MailShell *) data;
- MailView *view = shell->mail_component->mail_view;
+ MailView *view = (MailView *)shell->mail_component->mail_view;
- mail_view_add_page (view, MAIL_VIEW_SETTINGS);
+ mail_view_add_page ((MailView *)view, MAIL_VIEW_SETTINGS);
}
static void
@@ -229,7 +230,7 @@ mail_shell_quit (MailShell *shell)
/* What other clean ups ?*/
gboolean quit = mail_component_can_quit (shell->mail_component);
if (quit) {
- mail_view_save(shell->mail_component->mail_view);
+ mail_view_save((MailView *)shell->mail_component->mail_view);
mail_component_quit (shell->mail_component);
gtk_main_quit();
}
@@ -270,7 +271,7 @@ static void
ms_show_post_druid (MailViewChild *mfv, MailShell *shell)
{
gtk_widget_show (((MailView *) shell->mail_component->mail_view)->folder_tree);
- mail_view_add_page (shell->mail_component->mail_view, MAIL_VIEW_SETTINGS);
+ mail_view_add_page ((MailView *)shell->mail_component->mail_view, MAIL_VIEW_SETTINGS);
}
void
@@ -280,13 +281,13 @@ mail_shell_construct (MailShell *shell)
GtkWidget *tmp, *img, *box, *ar1, *ar2;
GtkStyle *style = gtk_widget_get_default_style ();
- mail_decoration_new (shell);
+ mail_decoration_new ((GtkWindow *)shell);
ms_init_style (style);
g_signal_connect ((GObject *)shell, "delete-event", G_CALLBACK (ms_delete_event), NULL);
gtk_window_set_type_hint ((GtkWindow *)shell, GDK_WINDOW_TYPE_HINT_NORMAL);
gtk_container_set_border_width (GTK_CONTAINER (shell), 1);
if (g_getenv("ANJAL_NO_MAX") == NULL)
- gtk_window_fullscreen (shell);
+ gtk_window_fullscreen ((GtkWindow *)shell);
else
gtk_window_set_default_size ((GtkWindow *)shell, 1024, 500);/* We officiall should support 800x600 */
@@ -309,27 +310,27 @@ mail_shell_construct (MailShell *shell)
/* priv->new_mail = gtk_button_new_with_mnemonic (_("New email")); */
priv->new_mail = gtk_button_new_with_mnemonic (NULL);
- gtk_button_set_relief (priv->new_mail, GTK_RELIEF_NONE);
+ gtk_button_set_relief ((GtkButton *)priv->new_mail, GTK_RELIEF_NONE);
gtk_button_set_image ((GtkButton *)priv->new_mail, gtk_image_new_from_icon_name("mail-message-new", GTK_ICON_SIZE_BUTTON));
gtk_box_pack_start ((GtkBox *)priv->top_bar, priv->new_mail, FALSE, FALSE, 0);
gtk_widget_show (priv->new_mail);
priv->check_mail = gtk_button_new ();
- gtk_button_set_relief (priv->check_mail, GTK_RELIEF_NONE);
+ gtk_button_set_relief ((GtkButton *)priv->check_mail, GTK_RELIEF_NONE);
box = gtk_hbox_new (FALSE, 0);
tmp = e_spinner_new_spinning_small_shown();
gtk_widget_hide(tmp);
- g_object_set_data (priv->check_mail, "spinner", tmp);
+ g_object_set_data ((GObject *)priv->check_mail, "spinner", tmp);
gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 0);
tmp = gtk_image_new_from_icon_name("mail-send-receive", GTK_ICON_SIZE_BUTTON);
gtk_widget_show(tmp);
- g_object_set_data (priv->check_mail, "icon", tmp);
+ g_object_set_data ((GObject *)priv->check_mail, "icon", tmp);
gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 0);
/* tmp = gtk_label_new_with_mnemonic (_("Check _email"));
gtk_widget_show(tmp);
gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 2);*/
- gtk_container_add (priv->check_mail, box);
+ gtk_container_add ((GtkContainer *)priv->check_mail, box);
gtk_widget_show(box);
gtk_box_pack_start ((GtkBox *)priv->top_bar, priv->check_mail, FALSE, FALSE, 0);
gtk_widget_show (priv->check_mail);
@@ -338,7 +339,7 @@ mail_shell_construct (MailShell *shell)
priv->search_bar = (GtkWidget *) gtk_hbox_new (FALSE, 6);
gtk_box_pack_start ((GtkBox *)priv->top_bar, priv->search_bar, TRUE, TRUE, 0);
gtk_widget_show (priv->search_bar);
- priv->search_entry = mail_search_new ();
+ priv->search_entry = (GtkWidget *)mail_search_new ();
((MailSearch *)priv->search_entry)->shell = shell;
gtk_widget_show (priv->search_entry);
gtk_box_pack_start ((GtkBox *)priv->search_bar, priv->search_entry, TRUE, TRUE, 24);
@@ -360,7 +361,7 @@ mail_shell_construct (MailShell *shell)
// priv->settings = gtk_button_new_with_mnemonic (_("Settings"));
priv->settings = gtk_button_new_with_mnemonic (NULL);
- gtk_button_set_relief (priv->settings, GTK_RELIEF_NONE);
+ gtk_button_set_relief ((GtkButton *)priv->settings, GTK_RELIEF_NONE);
gtk_button_set_image ((GtkButton *)priv->settings, gtk_image_new_from_icon_name("preferences-system", GTK_ICON_SIZE_BUTTON));
gtk_box_pack_start ((GtkBox *)priv->option_bar, priv->settings, FALSE, FALSE, 6);
@@ -370,8 +371,8 @@ mail_shell_construct (MailShell *shell)
priv->quit = gtk_button_new ();
tmp = gtk_image_new_from_icon_name("gtk-close", GTK_ICON_SIZE_BUTTON);
gtk_widget_show (tmp);
- gtk_container_add (priv->quit, tmp);
- gtk_button_set_relief (priv->quit, GTK_RELIEF_NONE);
+ gtk_container_add ((GtkContainer *)priv->quit, tmp);
+ gtk_button_set_relief ((GtkButton *)priv->quit, GTK_RELIEF_NONE);
// gtk_tool_button_set_icon_widget ((GtkButton *)priv->quit, gtk_image_new_from_icon_name("gtk-close", GTK_ICON_SIZE_BUTTON));
gtk_box_pack_start ((GtkBox *)priv->option_bar, priv->quit, FALSE, FALSE, 0);
@@ -381,14 +382,14 @@ mail_shell_construct (MailShell *shell)
gtk_container_add ((GtkContainer *)shell, priv->box);
- shell->mail_component = mail_component_create (shell, FALSE);
+ shell->mail_component = mail_component_create ((GtkWidget *)shell, FALSE);
priv->side_pane = gtk_hpaned_new ();
tmp = gtk_vpaned_new ();
- mail_view_set_folder_tree_widget (shell->mail_component->mail_view, tmp);
- ((MailSearch *)priv->search_entry)->view = shell->mail_component->mail_view;
+ mail_view_set_folder_tree_widget ((MailView *)shell->mail_component->mail_view, tmp);
+ ((MailSearch *)priv->search_entry)->view = (MailView *)shell->mail_component->mail_view;
shell->priv->folder_pane = tmp;
// gtk_box_pack_start (priv->side_pane, tmp, FALSE, FALSE, 0);
- gtk_paned_add1 (priv->side_pane, tmp);
+ gtk_paned_add1 ((GtkPaned *)priv->side_pane, tmp);
gtk_widget_show (priv->side_pane);
gtk_widget_show (tmp);
@@ -397,22 +398,22 @@ mail_shell_construct (MailShell *shell)
gtk_combo_box_set_active ((GtkComboBox *)img, 0);
gtk_widget_show (img);
- gtk_paned_pack2 (tmp, img, FALSE, FALSE);
- gtk_paned_add1 (tmp, shell->mail_component->folder_tree);
+ gtk_paned_pack2 ((GtkPaned *)tmp, img, FALSE, FALSE);
+ gtk_paned_add1 ((GtkPaned *)tmp, shell->mail_component->folder_tree);
gtk_widget_set_size_request (shell->mail_component->folder_tree, 200, 300);
- mail_view_set_folder_tree (shell->mail_component->mail_view, shell->mail_component->folder_tree);
+ mail_view_set_folder_tree ((MailView *)shell->mail_component->mail_view, shell->mail_component->folder_tree);
gtk_widget_show (shell->mail_component->folder_tree);
//gtk_button_set_image ((GtkButton *)tmp, gtk_image_new_from_icon_name("stock_right", GTK_ICON_SIZE_BUTTON));
//img = gtk_image_new_from_icon_name("stock_right", GTK_ICON_SIZE_BUTTON);
//gtk_button_set_image ((GtkButton *)tmp, gtk_image_new_from_file(ANJAL_IMAGEDIR "arrow-right.png"));
tmp = gtk_button_new ();
- box =gtk_hbox_new (FALSE, 0);
+ box = gtk_hbox_new (FALSE, 0);
ar1 = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_NONE);
ar2 = gtk_arrow_new(GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
- gtk_box_pack_start (box, ar1, FALSE, FALSE, 0);
- gtk_box_pack_start (box, ar2, FALSE, FALSE, 0);
- gtk_container_add (tmp, box);
+ gtk_box_pack_start ((GtkBox *)box, ar1, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *)box, ar2, FALSE, FALSE, 0);
+ gtk_container_add ((GtkContainer *)tmp, box);
gtk_widget_show (box);
gtk_widget_hide (tmp);
gtk_widget_hide (ar1);
@@ -420,28 +421,28 @@ mail_shell_construct (MailShell *shell)
// gtk_box_pack_start (priv->side_pane, tmp, FALSE, FALSE, 0);
//gtk_widget_set_size_request (tmp, 16, -1);
box = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (box, tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 0);
priv->slider = tmp;
- g_object_set_data (priv->slider, "left-arrow", ar1);
- g_object_set_data (priv->slider, "right-arrow", ar2);
- gtk_box_pack_start (box, shell->mail_component->mail_view, TRUE, TRUE, 0);
+ g_object_set_data ((GObject *)priv->slider, "left-arrow", ar1);
+ g_object_set_data ((GObject *)priv->slider, "right-arrow", ar2);
+ gtk_box_pack_start ((GtkBox *)box, shell->mail_component->mail_view, TRUE, TRUE, 0);
gtk_widget_show (shell->mail_component->mail_view);
gtk_widget_show (box);
- gtk_paned_add2 (priv->side_pane, box);
+ gtk_paned_add2 ((GtkPaned *)priv->side_pane, box);
gtk_box_pack_start ((GtkBox *)priv->box, priv->side_pane, TRUE, TRUE, 6);
// mail_view_add_page (shell->mail_component->mail_view, MAIL_VIEW_FOLDER);
g_signal_connect (priv->new_mail, "clicked", G_CALLBACK (new_email_btn_clicked),
shell);
- mail_view_set_slider (shell->mail_component->mail_view, priv->slider);
- mail_view_set_sort_by (shell->mail_component->mail_view, priv->sort);
- mail_view_set_check_email (shell->mail_component->mail_view, priv->check_mail);
+ mail_view_set_slider ((MailView *)shell->mail_component->mail_view, priv->slider);
+ mail_view_set_sort_by ((MailView *)shell->mail_component->mail_view, priv->sort);
+ mail_view_set_check_email ((MailView *)shell->mail_component->mail_view, priv->check_mail);
if (ms_check_new()) {
MailViewChild *mc;
gtk_widget_hide (((MailView *) shell->mail_component->mail_view)->folder_tree);
- mc = mail_view_add_page (shell->mail_component->mail_view, MAIL_VIEW_ACCOUNT);
+ mc = mail_view_add_page ((MailView *)shell->mail_component->mail_view, MAIL_VIEW_ACCOUNT);
g_signal_connect (mc, "view-close", G_CALLBACK(ms_show_post_druid), shell);
}
}
diff --git a/src/mail-view.h b/src/mail-view.h
index c73d510..b550533 100644
--- a/src/mail-view.h
+++ b/src/mail-view.h
@@ -76,4 +76,6 @@ void mail_view_set_folder_tree (MailView *mv, GtkWidget *tree);
void mail_view_save (MailView *mv);
MailViewChild * mail_view_add_page (MailView *mv, guint16 type);
void mail_view_set_search (MailView *view, const char *search);
+void mail_view_set_slider (MailView *mv, GtkWidget *slider);
+
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]