GNOME.org
 

gyrus r324 - in trunk: . src

Author: csaavedra
Date: Fri Feb 29 15:48:42 2008
New Revision: 324
URL: http://svn.gnome.org/viewvc/gyrus?rev=324&view=rev

Log:
2008-02-29  Claudio Saavedra  <csaavedra alumnos utalca cl>

	Many, many functions and variables declaration fixes, courtesy of
	strace.



Modified:
   trunk/ChangeLog
   trunk/src/gyrus-admin-acl.c
   trunk/src/gyrus-admin-mailbox.c
   trunk/src/gyrus-admin.c
   trunk/src/gyrus-common.c
   trunk/src/gyrus-connection.c
   trunk/src/gyrus-dialog-find-mailbox.c
   trunk/src/gyrus-dialog-mailbox-new.c
   trunk/src/gyrus-main-app.c
   trunk/src/gyrus-report.c
   trunk/src/gyrus-session.c

Modified: trunk/src/gyrus-admin-acl.c
==============================================================================
--- trunk/src/gyrus-admin-acl.c	(original)
+++ trunk/src/gyrus-admin-acl.c	Fri Feb 29 15:48:42 2008
@@ -31,6 +31,7 @@
 #include "gyrus-main-app.h"
 #include "gyrus-admin.h"
 #include "gyrus-admin-acl.h"
+#include "gyrus-common.h"
 
 gboolean
 gyrus_admin_acl_delete_entry (GyrusAdmin *admin, const gchar *mailbox,
@@ -68,6 +69,7 @@
 			   gchar **error)
 {
 	GyrusImapStatus status;
+	gchar *msg;
 
 	if (!gyrus_common_str_is_ascii (user)) {
 		if (error != NULL)
@@ -86,8 +88,8 @@
 		return FALSE;
 	}
 	
-	gchar *msg = g_strdup_printf (". setacl \"%s\" \"%s\" %s\n",
-				      mailbox, user, permissions);
+	msg = g_strdup_printf (". setacl \"%s\" \"%s\" %s\n",
+			       mailbox, user, permissions);
 	gyrus_admin_write_channel (admin, msg);
 	g_free (msg);
 
@@ -112,7 +114,7 @@
 	return (status == GYRUS_IMAP_STATUS_OK);
 }
 
-gint 
+static gint 
 gyrus_admin_acl_sort_func (gconstpointer a,
 			   gconstpointer b)
 {

Modified: trunk/src/gyrus-admin-mailbox.c
==============================================================================
--- trunk/src/gyrus-admin-mailbox.c	(original)
+++ trunk/src/gyrus-admin-mailbox.c	Fri Feb 29 15:48:42 2008
@@ -50,10 +50,11 @@
 			       gchar **error)
 {
 	gchar *msg, **parts;
+	GyrusImapStatus status;
+
 	msg = g_strdup_printf (". getquota \"%s\"\n", mailbox_path);
 	gyrus_admin_write_channel (admin, msg);
 	g_free (msg);
-	GyrusImapStatus status;
 
 	*error = NULL;
 	
@@ -85,7 +86,7 @@
 	return TRUE;
 }
 
-void
+static void
 gyrus_admin_mailbox_get_human_quota (gint quota, gchar *str_quota)
 {
 	gchar* prefix;
@@ -192,12 +193,14 @@
 void
 gyrus_admin_mailbox_clear_info (GyrusAdmin *admin)
 {
+	GtkListStore *store;
+
 	gtk_label_set_text (GTK_LABEL (admin->priv->label_mailbox_name), "");
 	gtk_label_set_text (GTK_LABEL (admin->priv->label_mailbox_owner), "");
 	gtk_label_set_text (GTK_LABEL (admin->priv->label_quota_limit), "");
 	gtk_label_set_text (GTK_LABEL (admin->priv->label_quota_free), "");
 
-	GtkListStore *store = GTK_LIST_STORE
+	store = GTK_LIST_STORE
 		(gtk_tree_view_get_model (admin->priv->treeview_acl));
 	gtk_list_store_clear (store);
 }
@@ -211,6 +214,7 @@
 	const gchar *new_quota_str;
 	gint new_quota;
 	gchar *new_quota_invalid;
+	gchar *mailbox_path;
 
 	new_quota_str =
 		gtk_entry_get_text (GTK_ENTRY (admin->priv->entry_quota_new));
@@ -218,9 +222,8 @@
 	if (!g_ascii_strcasecmp (new_quota_str, ""))
 		return;
 	
-	gchar *mailbox_path =
-		g_strdup (gtk_label_get_text
-			  (GTK_LABEL (admin->priv->label_mailbox_name)));
+	mailbox_path = g_strdup (gtk_label_get_text
+				 (GTK_LABEL (admin->priv->label_mailbox_name)));
 
 	new_quota = 1024 * g_strtod (new_quota_str, &new_quota_invalid);
 
@@ -255,7 +258,7 @@
 	gtk_button_clicked (button);
 }
 
-gboolean
+static gboolean
 gyrus_admin_mailbox_exists (GyrusAdmin *admin,
 			    const gchar *mailbox)
 {
@@ -282,7 +285,7 @@
 	return FALSE;
 }
 
-gboolean 
+static gboolean 
 gyrus_admin_mailbox_name_is_valid (GyrusAdmin *admin, const gchar *mailbox)
 {
 	return (/*!g_strrstr (mailbox, " ") &&*/
@@ -322,7 +325,9 @@
 {
 	GIOError ioerror = G_IO_ERROR_NONE;
 	GyrusImapStatus status;
-	
+	gchar *new_mailbox;
+	gchar *msg;
+
 	if (!gyrus_admin_mailbox_name_is_valid (admin, mailbox)) {
 		*error = g_strdup_printf (_("'%s' is not a valid "
 					    "mailbox name. Please try a different one."),
@@ -338,7 +343,7 @@
 		return FALSE;
 	}
 	
-	gchar *new_mailbox = g_strconcat (path, gyrus_admin_get_separator_char (admin), 
+	new_mailbox = g_strconcat (path, gyrus_admin_get_separator_char (admin), 
 					  mailbox, NULL);
 
 	if (gyrus_admin_mailbox_exists (admin, new_mailbox)) {
@@ -348,7 +353,7 @@
 		return FALSE;
 	}
 
-	gchar *msg = g_strdup_printf (". create \"%s\"\n", new_mailbox);
+	msg = g_strdup_printf (". create \"%s\"\n", new_mailbox);
 	ioerror = gyrus_admin_write_channel (admin, msg);
 	g_free (msg);
 
@@ -376,16 +381,17 @@
 /* Returns a GList of all the mailboxes under a given mailbox.
    This list must be freed, and also it's elements.
  */
-GList *
+static GList *
 gyrus_admin_get_submailboxes (GyrusAdmin *admin,
 			      const gchar *mailbox)
 {
-	g_assert (GYRUS_IS_ADMIN (admin));
-		  
 	GList *list = NULL;
 	gchar *c_mailbox;
-	
-	gchar *msg = g_strdup_printf (". list \"%s\" *\n", mailbox);
+	gchar *msg;
+
+	g_assert (GYRUS_IS_ADMIN (admin));
+
+	msg = g_strdup_printf (". list \"%s\" *\n", mailbox);
 	gyrus_admin_write_channel (admin, msg);
 	g_free (msg);
 
@@ -407,17 +413,19 @@
 	return list;
 }
 
-gboolean
+static gboolean
 gyrus_admin_mailbox_delete (GyrusAdmin *admin,
 			    const gchar *mailbox,
 			    gchar **error)
 {
-
+	GyrusImapStatus status;
+	gchar *msg;
+	
 	g_assert (GYRUS_IS_ADMIN (admin));
 
-	gchar *msg = g_strdup_printf (". delete \"%s\"\n",
-				      mailbox);
-	GyrusImapStatus status;
+	msg = g_strdup_printf (". delete \"%s\"\n",
+			       mailbox);
+
 	gyrus_admin_write_channel (admin, msg);
 	g_free (msg);
 
@@ -488,7 +496,8 @@
 gyrus_admin_acl_set_tree_view (GyrusAdmin *admin, const gchar *mailbox_path)
 {
 	GtkTreeIter iter;
-	GList *list = NULL;
+	GList *list = NULL;	
+	GList *l_iter;
 	GtkTreeModel *model;
 	gchar *error;
 	
@@ -514,8 +523,6 @@
 	gtk_widget_hide (admin->priv->label_acl);
 	gtk_widget_show (GTK_WIDGET (admin->priv->scrolled_acl));
 	
-	GList *l_iter;
-	
 	for (l_iter = list; l_iter != NULL; l_iter = g_list_next (l_iter)) {
 		gtk_list_store_append (GTK_LIST_STORE (model), &iter);
 		gtk_list_store_set (GTK_LIST_STORE (model), &iter,
@@ -624,6 +631,8 @@
 	GtkTreePath *path;
 	gboolean duplicated = FALSE;
 	GyrusImapAclEntry *entry;
+	GList *l_iter;
+	gint i;
 	const gchar* mailbox = gtk_label_get_text (GTK_LABEL (admin->priv->label_mailbox_name));
 
 	gchar *default_entry_name = g_strdup (_("new entry"));
@@ -638,14 +647,14 @@
 
 	/* check it the new name already exists. */
 
-	gint i = 0;
+	i = 0;
 	do {
 		if (i > 0) {
 			g_free (entry_name);
 			entry_name = g_strdup_printf ("%s %i", default_entry_name, i);
 			duplicated = FALSE;
 		}
-		GList *l_iter = acl;
+		l_iter = acl;
 		while (l_iter != NULL && !duplicated) {
 			entry = GYRUS_IMAP_ACL_ENTRY (l_iter->data);
 			if (strcmp (entry->identifier, entry_name) == 0)
@@ -654,7 +663,7 @@
 		}
 		if (duplicated)
 			i++;
-	}while (duplicated);
+	} while (duplicated);
 	
 	gyrus_admin_acl_list_free (acl);
 	

Modified: trunk/src/gyrus-admin.c
==============================================================================
--- trunk/src/gyrus-admin.c	(original)
+++ trunk/src/gyrus-admin.c	Fri Feb 29 15:48:42 2008
@@ -224,7 +224,7 @@
 	admin->priv = priv;
 }
 
-void
+static void
 gyrus_admin_init_connect_signals (GyrusAdmin *admin)
 {
 	g_signal_connect (G_OBJECT (admin->priv->button_connect), "clicked",
@@ -321,7 +321,7 @@
 	return mb_name;
 }
 
-void
+static void
 gyrus_admin_set_separator_char_auto (GyrusAdmin *admin)
 {
 	gchar **str_v;
@@ -344,7 +344,7 @@
 	g_strfreev (str_v);
 }
 
-void
+static void
 gyrus_admin_get_users_list (GyrusAdmin *admin)
 {
 	GtkTreeStore *store;
@@ -477,7 +477,7 @@
 	g_free (msg);
 }
 
-gboolean
+static gboolean
 gyrus_admin_on_treeview_focused (GtkWidget *widget,
 				 GtkDirectionType arg1,
 				 gpointer data)
@@ -498,14 +498,14 @@
 gyrus_admin_initialize_mailbox_tree_view (GyrusAdmin *admin, 
 					  gboolean is_orphaned)
 {
-	g_return_if_fail (GYRUS_IS_ADMIN (admin));
-	
 	GtkTreeView *treeview;
 	GtkTreeModel *model;
 	GtkTreeViewColumn* column;
 	GtkCellRenderer *renderer;
 	GtkTreeSelection *selection;
 
+	g_return_if_fail (GYRUS_IS_ADMIN (admin));
+	
 	if (is_orphaned) {
 		treeview = admin->priv->treeview_corrupt_mailbox;
 	} else {
@@ -577,15 +577,12 @@
 static void
 gyrus_admin_initialize_acl_tree_view (GyrusAdmin *admin)
 {
-	g_return_if_fail (GYRUS_IS_ADMIN (admin));
-
-	GtkTreeView *view = admin->priv->treeview_acl;
-
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
 	GtkTreeSelection *selection;
 	GtkListStore *model;
-	
+	GtkTreeView *view;
+	gint i;
 	gchar *perms[9] = {
 		_("lookup"),
 		_("read"),
@@ -598,8 +595,10 @@
 		_("admin")
 	};
 
-	gint i;
+	g_return_if_fail (GYRUS_IS_ADMIN (admin));
 
+	view = admin->priv->treeview_acl;
+	
 	column = gtk_tree_view_column_new ();
 	gtk_tree_view_column_set_title (column, _("Identifier"));
 	gtk_tree_view_column_set_resizable (column, TRUE);
@@ -660,15 +659,15 @@
 	gtk_tree_view_set_model (view, GTK_TREE_MODEL (model));
 }
 
-GTcpSocket *
+static GTcpSocket *
 gyrus_admin_create_socket_from_session (GyrusSession *session)
 {
-	g_return_val_if_fail (session, NULL);
-	
 	GInetAddr *addr;
 	GTcpSocket *sock;
 	gchar *msg;
 
+	g_return_val_if_fail (session, NULL);
+	
 	addr = gnet_inetaddr_new (session->host, session->port);
 	if (!addr) {
 		msg = g_strdup_printf (_("%s could not be found. Please check the name and try again."),
@@ -692,7 +691,7 @@
 	return sock;
 }
 
-void
+static void
 gyrus_admin_initialize_channel (GyrusAdmin *admin)
 {
 	g_return_if_fail (admin->priv->iochannel == NULL);
@@ -712,11 +711,10 @@
 	guint bytes_read;
 	gchar **tokens = NULL;
 	GIOError error;
-	
-	*message = NULL;
-
 	GyrusImapStatus imap_status;
 
+	*message = NULL;
+
 	/* Trick to ignore the ALERTs */
 
 	do {
@@ -802,14 +800,14 @@
 	return (status == GYRUS_IMAP_STATUS_BYE);
 }
 
-void
+static void
 gyrus_admin_clean_mailbox_treeview (GtkTreeView *treeview, const gchar *title)
 {
-	g_return_if_fail (GTK_IS_TREE_VIEW (treeview));
-
 	GtkTreeStore *store;
 	GtkTreeViewColumn *column;
 	
+	g_return_if_fail (GTK_IS_TREE_VIEW (treeview));
+
 	store = GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)));
 	gtk_tree_store_clear (store);
 
@@ -856,7 +854,7 @@
  * Return value: an IMAP "quoted" corresponding to the string, which
  * the caller must free.
  **/
-char *
+static char *
 imap_quote_string (const char *str)
 {
 	const char *p;
@@ -886,7 +884,7 @@
 }
 
 /* returns whether the conection can be established or not. */
-GyrusAdminLoginError
+static GyrusAdminLoginError
 gyrus_admin_login (GyrusAdmin *admin)
 {
 	GTcpSocket *socket;
@@ -939,7 +937,7 @@
 	return error;
 }
 
-void
+static void
 gyrus_admin_post_login (GyrusAdmin *admin)
 {
 	if (strcmp (gyrus_admin_get_separator_char (admin), "auto") == 0)
@@ -952,14 +950,14 @@
 	gyrus_admin_get_users_list (admin);
 }
 
-void
+static void
 gyrus_admin_pre_logout (GyrusAdmin *admin)
 {
 	gyrus_admin_logout (admin);
 	gyrus_admin_logged_out (admin);
 }
 
-void
+static void
 gyrus_admin_pre_login (GyrusAdmin *admin)
 {
 	GyrusAdminLoginError error;
@@ -1012,7 +1010,7 @@
 
 
 /*** Public Methods ****/
-gboolean
+static gboolean
 gyrus_admin_select_foreach_func (GtkTreeModel *model, GtkTreePath *path,
 				 GtkTreeIter *iter, gpointer data)
 {
@@ -1151,15 +1149,17 @@
 
 	return !is_visible;
 }
-void
+
+static void
 gyrus_admin_load_session_info (GyrusAdmin *admin, GyrusSession *session)
 {
+	gchar *port;
+
 	g_return_if_fail (GYRUS_IS_ADMIN (admin));
 
 	if (session == NULL)
 		return;
 	
-	gchar *port;
 	port = g_strdup_printf ("%d", session->port);
 	
 	if (!admin->priv->session) {
@@ -1219,8 +1219,11 @@
 gyrus_admin_on_button_connect_clicked (GtkButton *button,
 				       gpointer user_data)
 {
+	GyrusAdmin *admin;
+
 	g_return_if_fail (GYRUS_ADMIN (user_data));
-	GyrusAdmin *admin = GYRUS_ADMIN (user_data);
+
+	admin = GYRUS_ADMIN (user_data);
 
 	if (gyrus_admin_is_connected (admin)) {
 		gyrus_admin_pre_logout (admin);
@@ -1259,17 +1262,17 @@
 
 	GtkTreeIter iter;
 	GtkTreeModel *model;
+	gchar *mailbox_path;
+	gchar **tokens;
 	GyrusAdmin *admin = GYRUS_ADMIN (user_data);
 
 	gboolean is_selected = gtk_tree_selection_get_selected (selection, &model, &iter);
 	if (is_selected)
 	{
-		gchar *mailbox_path;
 		gtk_tree_model_get (model, &iter,
 				    COL_MAILBOX_NAME, &mailbox_path,
 				    -1);
 
-		gchar **tokens;
 		tokens = g_strsplit (mailbox_path, gyrus_admin_get_separator_char (admin), 3);
 		gyrus_admin_mailbox_show_info (admin, tokens[1],
 					       mailbox_path);
@@ -1300,22 +1303,22 @@
 				 gchar *path,
 				 gpointer user_data)
 {
-	g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (user_data));
-	GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (user_data);
-	
 	GyrusAdmin *admin;
 	GyrusColumnAcl col;
 	GtkListStore *store;
 	GtkTreeIter iter;
 	gboolean has_permission;
-
+	GtkTreeViewColumn *column;
 	gchar *permissions = "lrswipcda";
-	
 	gchar *user;
 	gchar *perm;
 	gchar *mailbox;
 	gchar *error;
 
+	g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (user_data));
+
+	column = GTK_TREE_VIEW_COLUMN (user_data);
+
 	admin = g_object_get_data (G_OBJECT (column),
 				   "parent-admin");
 	col = GPOINTER_TO_INT (
@@ -1356,7 +1359,7 @@
 	g_free (mailbox);
 }
 
-gboolean
+static gboolean
 gyrus_admin_acl_eliminate_model_entry (GtkTreeModel *model,
 				       GtkTreePath *path,
 				       GtkTreeIter *iter,
@@ -1377,18 +1380,20 @@
 	return FALSE;
 }
 
-gboolean
+static gboolean
 gyrus_admin_ask_user_if_overwrite (GyrusAdmin *admin,
 				   gchar *entry_name)
 {
 	GtkWidget *dialog;
+	int result;
+
 	dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
 					 GTK_MESSAGE_QUESTION,
 					 GTK_BUTTONS_YES_NO,
 					 _("An entry called '%s' already exists. Overwrite it?"),
 					 entry_name);
 	
-	int result = gtk_dialog_run (GTK_DIALOG (dialog));
+	result = gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
 	
 	return (result == GTK_RESPONSE_YES);
@@ -1406,6 +1411,9 @@
 	GtkTreeModel *model;
 	gchar *oldname;
 	gchar *error;
+	gchar *mailbox;
+	GList *acl, *l_iter;
+	gchar *rights;
 	GyrusAdmin *admin = GYRUS_ADMIN (user_data);
 	
 	model = gtk_tree_view_get_model (admin->priv->treeview_acl);
@@ -1423,12 +1431,12 @@
 		return;
 	}
 
-	gchar *mailbox = g_strdup (gtk_label_get_text
+	mailbox = g_strdup (gtk_label_get_text
 				   (GTK_LABEL (admin->priv->label_mailbox_name)));
-	GList *acl = gyrus_admin_acl_get (admin, mailbox, NULL);
+	acl = gyrus_admin_acl_get (admin, mailbox, NULL);
 
 	/* check it the new name already exists. */
-	GList *l_iter = acl;
+	l_iter = acl;
 	while (l_iter != NULL && !duplicated) {
 		entry = GYRUS_IMAP_ACL_ENTRY (l_iter->data);
 		if (strcmp (entry->identifier, newname) == 0)
@@ -1437,7 +1445,7 @@
 	}
 
 	/* Obtain the rights of the entry to be renamed */
-	gchar *rights = NULL;
+	rights = NULL;
 	l_iter = acl;
 	while (l_iter != NULL && rights == NULL) {
 		entry = GYRUS_IMAP_ACL_ENTRY (l_iter->data);

Modified: trunk/src/gyrus-common.c
==============================================================================
--- trunk/src/gyrus-common.c	(original)
+++ trunk/src/gyrus-common.c	Fri Feb 29 15:48:42 2008
@@ -45,12 +45,12 @@
 gboolean
 gyrus_gtk_entry_has_text (GtkEntry *entry)
 {
-	g_return_val_if_fail (GTK_IS_ENTRY (entry), FALSE);
-
 	const gchar *text;
         const gchar *start;
         gboolean has_text;
 
+	g_return_val_if_fail (GTK_IS_ENTRY (entry), FALSE);
+
         text = gtk_entry_get_text (entry);
 
         start = text;
@@ -70,7 +70,8 @@
 	GtkWidget *dialog;
 	GtkWidget *entry_password;
 	gchar *password = NULL;
-	
+	gint result;
+
 	file_glade = g_strdup_printf ("%s%c%s", GYRUS_GLADE_DIR,
 				      G_DIR_SEPARATOR, "page.glade");
 	xml = glade_xml_new (file_glade, "dialog_password", "gyrus");
@@ -79,7 +80,7 @@
 	dialog         = glade_xml_get_widget (xml, "dialog_password");
 	entry_password = glade_xml_get_widget (xml, "entry_password");
 	
-	gint result = gtk_dialog_run (GTK_DIALOG (dialog));
+	result = gtk_dialog_run (GTK_DIALOG (dialog));
 
 	switch (result) {
 	case GTK_RESPONSE_OK:

Modified: trunk/src/gyrus-connection.c
==============================================================================
--- trunk/src/gyrus-connection.c	(original)
+++ trunk/src/gyrus-connection.c	Fri Feb 29 15:48:42 2008
@@ -89,7 +89,7 @@
 
 /*** Private API ***/
 
-void
+static void
 gyrus_connection_receive (GyrusConnection *conn)
 {
 	g_return_if_fail (GYRUS_IS_CONNECTION (conn));
@@ -101,7 +101,7 @@
  * buffer: a buffer to copy the first "size" bytes.
  */
 #ifdef HAVE_GNUTLS
-gssize
+static gssize
 gyrus_connection_tls_read (GyrusConnection *conn,
                            gchar *buffer, gsize size)
 {
@@ -206,11 +206,14 @@
 static void
 gyrus_connection_prepare_ubuffer (GyrusConnection *conn)
 {
+	gchar *buf;
+	GString *line;
+  
 	g_return_if_fail (GYRUS_IS_CONNECTION (conn));
 	g_return_if_fail (conn->priv->buffer != NULL);
 
-	gchar *buf = conn->priv->buffer->str;
-	GString *line = g_string_new ("");
+	buf = conn->priv->buffer->str;
+	line = g_string_new ("");
 	
 	g_string_set_size (conn->priv->ubuffer, 0);
 	g_print ("pure buffer:\n%s\n", buf);
@@ -747,6 +750,8 @@
 void
 gyrus_connection_send (GyrusConnection *conn, const gchar *buffer)
 {
+	GString *cmd;
+  
 	g_return_if_fail (GYRUS_IS_CONNECTION (conn));
 	g_return_if_fail (buffer != NULL);
 	g_return_if_fail (gyrus_connection_get_connected (conn));
@@ -755,7 +760,7 @@
 	g_string_set_size (conn->priv->buffer, 0);
 	
 	/* Prepare the request string */
-	GString *cmd = conn->priv->command = g_string_new ("");
+	cmd = conn->priv->command = g_string_new ("");
 	g_string_printf (cmd, "%s %s\n", COMMAND_ID, buffer);
 	
 	g_print ("Sending command <%s> %d bytes\n", cmd->str, cmd->len);

Modified: trunk/src/gyrus-dialog-find-mailbox.c
==============================================================================
--- trunk/src/gyrus-dialog-find-mailbox.c	(original)
+++ trunk/src/gyrus-dialog-find-mailbox.c	Fri Feb 29 15:48:42 2008
@@ -57,7 +57,7 @@
 
 /* Callbacks */
 
-gboolean
+static gboolean
 gyrus_dialog_find_mailbox_kp (GtkWidget *widget,
 			      GdkEventKey *event,
 			      gpointer user_data)
@@ -80,7 +80,7 @@
 	GYRUS_FIND_MODE_ANY
 } GyrusFindMode;
 
-gboolean
+static gboolean
 gyrus_dialog_find_mailbox_compare_with_method (const gchar *haystack,
 					       const gchar *needle,
 					       GyrusFindMode mode)
@@ -96,7 +96,7 @@
 	return FALSE;
 }
 
-void
+static void
 gyrus_dialog_find_mailbox_on_button_find_clicked (GtkButton *button,
 						  gpointer user_data)
 {
@@ -181,7 +181,7 @@
 	g_object_unref (treeview);
 }
 
-void
+static void
 gyrus_dialog_find_mailbox_on_entry_changed (GtkEditable *editable,
 					   gpointer user_data)
 {
@@ -204,7 +204,7 @@
 	g_type_class_add_private (gobject_class, sizeof (GyrusDialogFindMailboxPrivate));
 }
 
-void
+static void
 gyrus_dialog_find_mailbox_init_get_widgets (GyrusDialogFindMailbox *dialog)
 {
 	GladeXML *xml_dialog;
@@ -234,7 +234,7 @@
 	dialog->priv->comboboxentry_mailbox = glade_xml_get_widget (xml_dialog, "comboboxentry_mailbox");
 }
 
-void
+static void
 gyrus_dialog_find_mailbox_init_connect_signals (GyrusDialogFindMailbox *dialog)
 {
 	g_signal_connect (G_OBJECT (dialog->priv->button_find), "clicked",
@@ -267,6 +267,8 @@
 static void
 gyrus_dialog_find_mailbox_init (GyrusDialogFindMailbox *dialog)
 {
+	GtkListStore *model;
+
 	dialog->priv = g_new0 (GyrusDialogFindMailboxPrivate, 1);
 
 	dialog->priv->admin = NULL;
@@ -278,7 +280,7 @@
 	gyrus_dialog_find_mailbox_init_get_widgets (dialog);
 	gyrus_dialog_find_mailbox_init_connect_signals (dialog);
 
-	GtkListStore *model = gtk_list_store_new (1, G_TYPE_STRING);
+	model = gtk_list_store_new (1, G_TYPE_STRING);
 	
 	gtk_combo_box_set_model (GTK_COMBO_BOX (dialog->priv->comboboxentry_mailbox),
 				 GTK_TREE_MODEL (model));

Modified: trunk/src/gyrus-dialog-mailbox-new.c
==============================================================================
--- trunk/src/gyrus-dialog-mailbox-new.c	(original)
+++ trunk/src/gyrus-dialog-mailbox-new.c	Fri Feb 29 15:48:42 2008
@@ -54,7 +54,7 @@
 
 /* Callbacks */
 
-void
+static void
 gyrus_dialog_mailbox_new_on_button_ok_clicked (GtkButton *button,
 					       gpointer user_data)
 {
@@ -65,11 +65,12 @@
 	gint quota;
 	gchar *error;
 	gchar *quota_invalid;
-	
+	GyrusAdmin *admin;
+
 	dialog = GYRUS_DIALOG_MAILBOX_NEW (user_data);
 	app = GYRUS_MAIN_APP (gtk_window_get_transient_for (GTK_WINDOW (dialog)));
 	
-	GyrusAdmin *admin = gyrus_main_app_get_current_admin (app);
+	admin = gyrus_main_app_get_current_admin (app);
 	
 	current_path = gyrus_admin_get_selected_mailbox (admin);
 
@@ -115,7 +116,7 @@
 	g_free (current_path);
 }
 
-void
+static void
 gyrus_dialog_mailbox_new_on_checkbutton_toggled (GtkToggleButton *toggle,
 						 gpointer user_data)
 {
@@ -135,7 +136,7 @@
 	gtk_widget_set_sensitive (dialog->priv->button_ok, sensitive);
 }
 
-void
+static void
 gyrus_dialog_mailbox_new_on_entry_changed (GtkEditable *editable,
 					   gpointer user_data)
 {
@@ -155,7 +156,7 @@
 	g_type_class_add_private (class, sizeof (GyrusDialogMailboxNewPrivate));
 }
 
-void
+static void
 gyrus_dialog_mailbox_new_init_get_widgets (GyrusDialogMailboxNew *dialog)
 {
 	GladeXML *xml_dialog;
@@ -185,7 +186,7 @@
 	dialog->priv->label_quota       = glade_xml_get_widget (xml_dialog, "label_quota");
 }
 
-void
+static void
 gyrus_dialog_mailbox_new_init_connect_signals (GyrusDialogMailboxNew *dialog)
 {
 	g_signal_connect (G_OBJECT (dialog->priv->button_ok), "clicked",

Modified: trunk/src/gyrus-main-app.c
==============================================================================
--- trunk/src/gyrus-main-app.c	(original)
+++ trunk/src/gyrus-main-app.c	Fri Feb 29 15:48:42 2008
@@ -100,7 +100,7 @@
 	
 }
 
-void
+static void
 gyrus_admin_delete_dialog_on_response (GtkDialog *dialog,
 				       gint result,
 				       gpointer user_data)
@@ -205,7 +205,7 @@
 	gyrus_main_app_about();
 }
 
-void
+static void
 gyrus_main_app_make_sensitivity_consistent (GyrusMainApp *app)
 {
 	gint n_page;
@@ -255,7 +255,7 @@
 		gtk_window_set_title (GTK_WINDOW (app), _("Cyrus IMAP Administrator"));
 }
 
-void
+static void
 gyrus_main_app_on_switch_page (GtkNotebook *notebook,
 			       GtkNotebookPage *page,
 			       guint page_num,
@@ -268,10 +268,12 @@
 	const gchar *session_name = gyrus_admin_get_current_session_name (admin);
 	gchar *title = g_strdup_printf (_("%s - Cyrus IMAP Administrator"), 
 					session_name);
+	gchar *mailbox;
+	
 	gtk_window_set_title (GTK_WINDOW (app), title);
 	g_free (title);
 
-	gchar *mailbox;
+
 	if (gyrus_admin_is_connected (admin))
 		gtk_action_group_set_sensitive (app->priv->actions_server, TRUE);
 	else
@@ -553,7 +555,7 @@
 	g_object_unref(pixbuf);
 }
 
-GtkWidget *
+static GtkWidget *
 gyrus_main_app_create_label_from_admin (GyrusMainApp *app, GyrusAdmin *admin)
 {
 	GtkWidget *hbox;
@@ -641,10 +643,13 @@
 GtkWidget *
 gyrus_main_app_append_page (GyrusMainApp *app, GyrusSession *session)
 {
-	g_return_val_if_fail (GYRUS_IS_MAIN_APP (app), NULL);
 	GtkWidget *hbox_label;
 	gint page_num;
-	GtkWidget *admin = gyrus_admin_new (session);
+	GtkWidget *admin;
+
+	g_return_val_if_fail (GYRUS_IS_MAIN_APP (app), NULL);
+
+	admin = gyrus_admin_new (session);
 
 	g_signal_connect (G_OBJECT (admin), "connected", 
 			  G_CALLBACK (main_app_on_admin_connected), 
@@ -688,9 +693,9 @@
 
 /***** Above functions doesnt belong this file ******/
 
-void
+static void
 gyrus_application_window_destroyed_callback (GtkWindow *window,
-					      gpointer userdata)
+					     gpointer userdata)
 {
 	gtk_main_quit();
 }

Modified: trunk/src/gyrus-report.c
==============================================================================
--- trunk/src/gyrus-report.c	(original)
+++ trunk/src/gyrus-report.c	Fri Feb 29 15:48:42 2008
@@ -114,7 +114,7 @@
 }
 
 
-void
+static void
 gyrus_report_cell_data_func (GtkTreeViewColumn *tree_column,
 			     GtkCellRenderer *renderer,
 			     GtkTreeModel *tree_model,
@@ -243,6 +243,7 @@
         gint n_users;
         gchar *msg;
 	GyrusAdmin *admin;
+	GtkTreeModel *model;
 
 	admin = report->admin;
 
@@ -255,7 +256,7 @@
 		
 	/* get model of treeview users */
 	treeview = gyrus_admin_get_users_treeview (admin);
-	GtkTreeModel *model = gtk_tree_view_get_model (treeview);
+	model = gtk_tree_view_get_model (treeview);
 
 	/* for each user */
 	gtk_tree_model_foreach (model, gyrus_report_evaluate_quota, report);
@@ -479,6 +480,7 @@
 void
 gyrus_report_create_data_page (GyrusReportData *report)
 {
+	GtkTreeModel *model;
 	const guchar font[24] = "Sans Regular";
 	/*  count number of user printed */
 	report->nlin = 1;
@@ -493,7 +495,7 @@
 	gyrus_report_draw_begin (report);
 
 	/* get model of treeview users */
-	GtkTreeModel *model = gtk_tree_view_get_model (report->treeview_report);
+	model = gtk_tree_view_get_model (report->treeview_report);
 	gtk_tree_model_foreach (model, gyrus_report_print_quota, report);
 	
 	gnome_print_showpage (report->gpc);

Modified: trunk/src/gyrus-session.c
==============================================================================
--- trunk/src/gyrus-session.c	(original)
+++ trunk/src/gyrus-session.c	Fri Feb 29 15:48:42 2008
@@ -112,7 +112,7 @@
 	
 /*** module callbacks ***/
 
-void
+static void
 gyrus_session_checkbutton_secure_toggled (GtkWidget *widget,
                                           gpointer data)
 {
@@ -123,14 +123,14 @@
 				993 : 143);
 }
 
-void
+static void
 gyrus_session_edit_on_button_cancel_clicked (GtkWidget *widget,
 					     gpointer user_data)
 {
 	gtk_widget_destroy (window_edit);
 }
 
-void
+static void
 gyrus_session_edit_on_button_ok_clicked (GtkWidget *widget,
 					 gpointer user_data)
 {
@@ -155,7 +155,7 @@
 	gyrus_session_free (session);
 }
 
-void
+static void
 gyrus_session_on_button_properties_clicked (GtkWidget *widget,
 					    gpointer user_data)
 {
@@ -170,7 +170,7 @@
 	gyrus_session_free (session);
 }
 
-void
+static void
 gyrus_session_on_button_new_clicked (GtkWidget *widget,
 				     gpointer user_data)
 {
@@ -181,7 +181,7 @@
 			  gyrus_session_append_session);
 }
 
-void
+static void
 gyrus_session_on_button_open_clicked (GtkWidget *widget,
 				      gpointer user_data)
 {
@@ -190,11 +190,12 @@
 	gyrus_session_free (session);
 }
 
-void
+static void
 gyrus_session_on_button_delete_session_clicked (GtkWidget *widget,
 						gpointer user_data)
 {
-	GyrusSession *session = gyrus_session_get_selected_session (TRUE);
+	gchar *host, *port, *user, *path, *sep_char, *usetls;
+	GyrusSession *session = gyrus_session_get_selected_session (TRUE);	
 
 	gchar *key  = g_strconcat (PATH_KEY, "StoredSessions", NULL);
 	GSList *sessions = gconf_client_get_list (conf_client, key,
@@ -212,8 +213,6 @@
 			       NULL);
 	gyrus_session_list_free (sessions);
 	
-	gchar *host, *port, *user, *path, *sep_char, *usetls;
-	
 	host = g_strconcat (PATH_SESSIONS, session->name, "/", "Host", NULL);
 	port = g_strconcat (PATH_SESSIONS, session->name, "/", "Port", NULL);
 	user = g_strconcat (PATH_SESSIONS, session->name, "/", "User", NULL);
@@ -240,13 +239,13 @@
 	gyrus_session_free (session);
 }
 
-void
+static void
 gyrus_session_on_button_cancel_clicked (GtkWidget *widget, gpointer user_data)
 {
 	gtk_widget_destroy (window);
 }
 
-void
+static void
 gyrus_session_on_row_activated (GtkTreeView       *tree_view,
 				GtkTreePath       *path,
 				GtkTreeViewColumn *column,
@@ -257,7 +256,7 @@
 	gyrus_session_free (session);	
 }
 
-void
+static void
 gyrus_session_list_set_sensitive (gboolean sensitive)
 {
 	gtk_widget_set_sensitive (button_open, sensitive);
@@ -265,7 +264,7 @@
 	gtk_widget_set_sensitive (button_properties, sensitive);
 }
 
-void
+static void
 gyrus_session_on_entry_changed (GtkEditable *editable,
 				gpointer user_data)
 {
@@ -344,11 +343,12 @@
 static void
 gyrus_session_append_session (GyrusSession *new)
 {
-	g_return_if_fail (new != NULL);
-
 	gchar *host, *port, *user, *sep_char, *usetls;
-
 	gchar *name;
+	gchar *key;
+	GSList *sessions, *element;
+	
+	g_return_if_fail (new != NULL);
 
 	if (new->name == NULL)
 	{
@@ -358,11 +358,11 @@
 		return;
 	}
 	
-	gchar *key = g_strconcat (PATH_KEY, "StoredSessions", NULL);
-	GSList *sessions = gconf_client_get_list (conf_client, key,
+	key = g_strconcat (PATH_KEY, "StoredSessions", NULL);
+	sessions = gconf_client_get_list (conf_client, key,
 						  GCONF_VALUE_STRING, NULL);
 
-	GSList * element = g_slist_find_custom (sessions, new->name,
+	element = g_slist_find_custom (sessions, new->name,
 						(GCompareFunc) g_ascii_strcasecmp);
 	if (element) {
 		gchar * msg = g_strdup_printf (_("Session named \"%s\" already exists."),
@@ -407,10 +407,10 @@
 static void
 gyrus_session_set_defaults_from_session (GyrusSession *session)
 {
-	g_return_if_fail (session);
-
 	gint value = 0;
 
+	g_return_if_fail (session);
+
 	gtk_entry_set_text (GTK_ENTRY (entry_host), session->host);
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (spinbutton_port),
 				   (gdouble) session->port);
@@ -489,7 +489,7 @@
 			    -1);
 }
 
-gboolean
+static gboolean
 gyrus_session_on_selection_changed (GtkTreeSelection *selection,
 				    GtkTreeModel *model,
 				    GtkTreePath *path,
@@ -500,7 +500,7 @@
 	return TRUE;
 }
 
-gboolean
+static gboolean
 gyrus_session_treeview_on_key_press_event (GtkWidget *widget,
 					   GdkEventKey *event,
 					   gpointer user_data)
@@ -522,7 +522,7 @@
 	return FALSE;
 }
 
-gboolean
+static gboolean
 gyrus_session_on_key_press_event (GtkWidget *widget,
 				  GdkEventKey *event,
 				  gpointer user_data)
@@ -583,7 +583,7 @@
 }
 
 /* If remove is TRUE, the selected item is removed from the array */
-GyrusSession *
+static GyrusSession *
 gyrus_session_get_selected_session (gboolean remove)
 {
 	GtkTreeIter iter;
@@ -660,16 +660,16 @@
 void
 gyrus_session_load_gconf_settings (void)
 {
-	GSList *aux;
 	gchar *key;
 	GyrusSession *session = NULL;
-	
+	GSList *sessions, *aux;
+
 	gtk_tree_view_set_model (GTK_TREE_VIEW (treeview_sessions),
 				 model_sessions);
 
 	key = g_strconcat (PATH_KEY, "StoredSessions", NULL);
-	GSList *sessions = gconf_client_get_list (conf_client, key,
-						  GCONF_VALUE_STRING, NULL);
+	sessions = gconf_client_get_list (conf_client, key,
+					  GCONF_VALUE_STRING, NULL);
 	g_free (key);
 	
 	if (sessions != NULL)
@@ -690,9 +690,11 @@
 static void
 gyrus_session_open (GyrusSession *session, gpointer user_data)
 {
+	GyrusMainApp *app;
+
 	g_return_if_fail (GYRUS_IS_MAIN_APP (user_data));
 
-	GyrusMainApp *app = GYRUS_MAIN_APP (user_data);
+	app = GYRUS_MAIN_APP (user_data);
 
 	if (!session->host || !strlen (session->host)) {
 		gyrus_common_show_message(GTK_WINDOW (window),
@@ -845,7 +847,7 @@
 	g_object_unref (G_OBJECT (conf_client));
 }
 
-gboolean 
+static gboolean 
 gyrus_session_seek_session (GtkTreeModel *model,
 			    GtkTreePath *path,
 			    GtkTreeIter *iter,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]