aboutsummaryrefslogtreecommitdiffstats
path: root/capplet
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2011-02-09 00:57:50 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:31 +0800
commit8efc1bc6f91e06ca61b00eb8119c9c36697e43a6 (patch)
tree95ec3e7ac41deec84bfd02de6ee05faf245b3dea /capplet
parentbe15d6730130da3f9e2fa6579233d5a9b304a7ea (diff)
downloadgsoc2013-evolution-8efc1bc6f91e06ca61b00eb8119c9c36697e43a6.tar.gz
gsoc2013-evolution-8efc1bc6f91e06ca61b00eb8119c9c36697e43a6.tar.zst
gsoc2013-evolution-8efc1bc6f91e06ca61b00eb8119c9c36697e43a6.zip
Bug 641756 - Fix warnings from GCC 4.6
GCC learned how to find dead assignments.
Diffstat (limited to 'capplet')
-rw-r--r--capplet/anjal-settings-main.c8
-rw-r--r--capplet/settings/mail-capplet-shell.c4
-rw-r--r--capplet/settings/mail-guess-servers.c6
-rw-r--r--capplet/settings/mail-view.c3
4 files changed, 2 insertions, 19 deletions
diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
index f211beaca7..23e4ac9b7b 100644
--- a/capplet/anjal-settings-main.c
+++ b/capplet/anjal-settings-main.c
@@ -77,9 +77,7 @@ mail_message_received_cb (UniqueApp *app G_GNUC_UNUSED,
guint time_ G_GNUC_UNUSED,
gpointer user_data)
{
- gchar *url;
GtkWindow *window = (GtkWindow *) user_data;
- gchar *args[2];
switch (command) {
case UNIQUE_ACTIVATE :
@@ -91,12 +89,6 @@ mail_message_received_cb (UniqueApp *app G_GNUC_UNUSED,
return UNIQUE_RESPONSE_OK;
case UNIQUE_OPEN :
- url = unique_message_data_get_text (message_data);
- args[0] = url;
- args[1] = NULL;
- //mail_shell_set_cmdline_args ((MailShell *)window, args);
- //mail_shell_handle_cmdline ((MailShell *)window);
- g_free (url);
gdk_window_raise (gtk_widget_get_window (GTK_WIDGET (window)));
gtk_window_deiconify (window);
gtk_window_present (window);
diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
index c14af1b609..030de15a94 100644
--- a/capplet/settings/mail-capplet-shell.c
+++ b/capplet/settings/mail-capplet-shell.c
@@ -202,9 +202,7 @@ static void
mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean just_druid, gboolean main_loop)
{
MailCappletShellPrivate *priv = shell->priv;
- GtkWidget *tmp;
GtkStyle *style = gtk_widget_get_default_style ();
- gint window_width = 1024;
gchar *custom_dir;
gtk_window_set_icon_name ((GtkWindow *)shell, "evolution");
@@ -214,7 +212,6 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean
gtk_window_set_type_hint ((GtkWindow *)shell, GDK_WINDOW_TYPE_HINT_NORMAL);
if (g_getenv("ANJAL_NO_MAX") == NULL && FALSE) {
GdkScreen *scr = gtk_widget_get_screen ((GtkWidget *)shell);
- window_width = gdk_screen_get_width (scr);
gtk_window_set_default_size ((GtkWindow *)shell, gdk_screen_get_width (scr), gdk_screen_get_height (scr));
gtk_window_set_decorated ((GtkWindow *)shell, FALSE);
} else {
@@ -247,7 +244,6 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean
shell->view = mail_view_new ();
shell->view->session = shell->priv->session;
gtk_widget_show ((GtkWidget *)shell->view);
- tmp = gtk_vbox_new (FALSE, 0);
gtk_box_pack_end ((GtkBox *)priv->box, (GtkWidget *)shell->view, TRUE, TRUE, 2);
mail_config_init (shell->priv->session);
diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c
index 66200cc5aa..9df7686356 100644
--- a/capplet/settings/mail-guess-servers.c
+++ b/capplet/settings/mail-guess-servers.c
@@ -91,7 +91,6 @@ xml_to_gchar (xmlChar *xml, EmailProvider *provider)
static SoupMessage *
get_url (SoupSession *session, const gchar *url)
{
- const gchar *name;
SoupMessage *msg;
const gchar *header;
@@ -100,8 +99,6 @@ get_url (SoupSession *session, const gchar *url)
soup_session_send_message (session, msg);
- name = soup_message_get_uri (msg)->path;
-
if (SOUP_STATUS_IS_REDIRECTION (msg->status_code)) {
header = soup_message_headers_get_one (msg->response_headers,
"Location");
@@ -167,7 +164,7 @@ static gboolean
parse_message (const gchar *msg, gint length, EmailProvider *provider)
{
xmlDocPtr doc;
- xmlNodePtr node, top;
+ xmlNodePtr node;
doc = xmlReadMemory (msg, length, "file.xml", NULL, 0);
@@ -197,7 +194,6 @@ parse_message (const gchar *msg, gint length, EmailProvider *provider)
return FALSE;
}
- top = node;
node = node->children;
while (node) {
if (strcmp ((gchar *)node->name, "incomingServer") == 0) {
diff --git a/capplet/settings/mail-view.c b/capplet/settings/mail-view.c
index afe65fd448..356916d9e9 100644
--- a/capplet/settings/mail-view.c
+++ b/capplet/settings/mail-view.c
@@ -118,7 +118,6 @@ static void
mail_view_class_init (MailViewClass *klass)
{
GObjectClass * object_class = G_OBJECT_CLASS (klass);
- AnjalMailViewClass *pclass;
signals[VIEW_NEW] =
g_signal_new ("view-new",
G_OBJECT_CLASS_TYPE (object_class),
@@ -128,7 +127,7 @@ mail_view_class_init (MailViewClass *klass)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- pclass = mail_view_parent_class = g_type_class_peek_parent (klass);
+ mail_view_parent_class = g_type_class_peek_parent (klass);
((AnjalMailViewClass *)klass)->set_folder_uri = mv_set_folder_uri;
((AnjalMailViewClass *)klass)->set_folder_tree = set_folder_tree;
((AnjalMailViewClass *)klass)->set_search = set_search;