krb5-auth-dialog r132 - in trunk: . src

[guidog svn gnome org]

Author: guidog
Date: Wed Mar 11 16:25:58 2009
New Revision: 132
URL: http://svn.gnome.org/viewvc/krb5-auth-dialog?rev=132&view=rev

Log:
silence compiler warnings

Modified:
   trunk/ChangeLog
   trunk/src/krb5-auth-applet.c
   trunk/src/krb5-auth-dialog.c
   trunk/src/krb5-auth-dialog.h
   trunk/src/krb5-auth-gconf.c
   trunk/src/krb5-auth-pwdialog.c
   trunk/src/krb5-auth-pwdialog.h

Modified: trunk/src/krb5-auth-applet.c
==============================================================================
--- trunk/src/krb5-auth-applet.c	(original)
+++ trunk/src/krb5-auth-applet.c	Wed Mar 11 16:25:58 2009
@@ -248,7 +248,7 @@
 
 /* determine the new tooltip text */
 static char*
-ka_applet_tooltip_text(KaApplet* applet, int remaining)
+ka_applet_tooltip_text(int remaining)
 {
 	int hours, minutes;
 	gchar* tooltip_text;
@@ -289,11 +289,11 @@
 }
 
 
-void
-ka_send_event_notification (KaApplet *applet __attribute__((__unused__)),
-			    const char *summary __attribute__((__unused__)),
-			    const char *message __attribute__((__unused__)),
-			    const char *icon __attribute__((__unused__)))
+static void
+ka_send_event_notification (KaApplet *applet G_GNUC_UNUSED,
+			    const char *summary G_GNUC_UNUSED,
+			    const char *message G_GNUC_UNUSED,
+			    const char *icon G_GNUC_UNUSED)
 {
 #ifdef HAVE_LIBNOTIFY
         const char *notify_icon;
@@ -330,7 +330,7 @@
 	static int last_warn = 0;
 	static gboolean expiry_notified = FALSE;
 	const char* tray_icon = ka_applet_select_icon (applet, remaining);
-	char* tooltip_text = ka_applet_tooltip_text (applet, remaining);
+	char* tooltip_text = ka_applet_tooltip_text (remaining);
 
 	if (remaining > 0) {
 		if (expiry_notified) {
@@ -375,7 +375,7 @@
 
 /* Free all resources and quit */
 static void
-ka_applet_cb_quit (GtkMenuItem* menuitem, gpointer user_data)
+ka_applet_cb_quit (GtkMenuItem* menuitem G_GNUC_UNUSED, gpointer user_data)
 {
 	KaApplet* applet = KA_APPLET(user_data);
 
@@ -385,16 +385,19 @@
 
 
 static void
-ka_applet_cb_about_dialog (GtkMenuItem* menuitem, gpointer user_data)
+ka_applet_cb_about_dialog (GtkMenuItem* menuitem G_GNUC_UNUSED,
+			   gpointer user_data G_GNUC_UNUSED)
 {
-	gchar* authors[] = {  "Christopher Aillon <caillon redhat com>",
-			      "Colin Walters <walters verbum org>",
-			      "Guido GÃnther <agx sigxpcu org>",
-			      NULL };
+	const gchar* authors[] = {  "Christopher Aillon <caillon redhat com>",
+			            "Colin Walters <walters verbum org>",
+			            "Guido GÃnther <agx sigxpcu org>",
+			            NULL };
 	gtk_show_about_dialog (NULL,
-			      "authors", authors,
-			      "version", VERSION,
-			      "copyright", "Copyright (C) 2004,2005,2006 Red Hat, Inc.,\n2008,2009 Guido GÃnther",
+			       "authors", authors,
+			       "version", VERSION,
+			       "copyright",
+	                       "Copyright (C) 2004,2005,2006 Red Hat, Inc.,\n"
+	                       "2008,2009 Guido GÃnther",
 			       NULL);
 }
 
@@ -442,8 +445,10 @@
 
 
 static void
-ka_tray_icon_on_menu (GtkStatusIcon* status_icon, guint button,
-		       guint activate_time, gpointer user_data)
+ka_tray_icon_on_menu (GtkStatusIcon* status_icon G_GNUC_UNUSED,
+                      guint button,
+                      guint activate_time,
+                      gpointer user_data)
 {
 	KaApplet *applet = KA_APPLET(user_data);
 
@@ -455,7 +460,8 @@
 
 
 static gboolean
-ka_tray_icon_on_click (GtkStatusIcon* status_icon, gpointer data)
+ka_tray_icon_on_click (GtkStatusIcon* status_icon G_GNUC_UNUSED,
+                       gpointer data)
 {
 	KaApplet *applet = KA_APPLET(data);
 
@@ -466,7 +472,9 @@
 
 
 static gboolean
-ka_applet_cb_show_trayicon (KaApplet* applet, GParamSpec* property, gpointer data)
+ka_applet_cb_show_trayicon (KaApplet* applet,
+                            GParamSpec* property G_GNUC_UNUSED,
+                            gpointer data G_GNUC_UNUSED)
 {
 	g_return_val_if_fail (applet != NULL, FALSE);
 	g_return_val_if_fail (applet->priv->tray_icon != NULL, FALSE);

Modified: trunk/src/krb5-auth-dialog.c
==============================================================================
--- trunk/src/krb5-auth-dialog.c	(original)
+++ trunk/src/krb5-auth-dialog.c	Wed Mar 11 16:25:58 2009
@@ -231,10 +231,10 @@
 
 
 static krb5_error_code
-auth_dialog_prompter (krb5_context ctx,
+auth_dialog_prompter (krb5_context ctx G_GNUC_UNUSED,
                       void *data,
-                      const char *name,
-                      const char *banner,
+                      const char *name G_GNUC_UNUSED,
+                      const char *banner G_GNUC_UNUSED,
                       int num_prompts,
                       krb5_prompt prompts[])
 {
@@ -256,7 +256,7 @@
 		errcode = KRB5_LIBOS_CANTREADPWD;
 
 		source_id = g_timeout_add_seconds (5, (GSourceFunc)krb5_auth_dialog_do_updates, applet);
-		ka_pwdialog_setup (pwdialog, (gchar *) prompts[i].prompt, prompts[i].hidden, invalid_auth);
+		ka_pwdialog_setup (pwdialog, (gchar *) prompts[i].prompt, invalid_auth);
 		response = ka_pwdialog_run (pwdialog);
 		switch (response)
 		{
@@ -367,7 +367,7 @@
 
 static void
 set_options_from_creds(const KaApplet* applet,
-		       krb5_context context,
+		       krb5_context context G_GNUC_UNUSED,
 		       krb5_creds *in,
 		       krb5_get_init_creds_opt *out)
 {
@@ -441,8 +441,8 @@
 }
 
 
-krb5_error_code
-ka_parse_name(KaApplet* applet, krb5_context kcontext, krb5_principal* kprinc)
+static krb5_error_code
+ka_parse_name(KaApplet* applet, krb5_context krbcontext, krb5_principal* kprinc)
 {
 	krb5_error_code ret;
 	gchar *principal = NULL;
@@ -450,7 +450,7 @@
 	g_object_get(applet, "principal", &principal,
 			     NULL);
 
-	ret = krb5_parse_name(kcontext, principal,
+	ret = krb5_parse_name(krbcontext, principal,
 			      kprinc);
 
 	g_free(principal);
@@ -628,7 +628,7 @@
 }
 
 static gboolean
-using_krb5()
+using_krb5(void)
 {
 	krb5_error_code err;
 	gboolean have_tgt = FALSE;
@@ -649,7 +649,8 @@
 
 
 void
-ka_destroy_cache (GtkMenuItem  *menuitem, gpointer data)
+ka_destroy_cache (GtkMenuItem  *menuitem G_GNUC_UNUSED,
+		  gpointer data)
 {
 	KaApplet *applet = KA_APPLET(data);
 	krb5_ccache  ccache;
@@ -766,7 +767,7 @@
 
 
 static void
-ka_secmem_init ()
+ka_secmem_init (void)
 {
 	/* Initialize secure memory.  1 is too small, so the default size
 	will be used.  */
@@ -780,7 +781,7 @@
 
 
 static gboolean
-ka_nm_init()
+ka_nm_init(void)
 {
 #ifdef ENABLE_NETWORK_MANAGER
 	libnm_glib_ctx *nm_context;
@@ -804,9 +805,14 @@
 
 
 static GtkWidget*
-ka_create_gtk_secure_entry (GladeXML *xml, gchar *func_name, gchar *name,
-			    gchar *s1, gchar *s2, gint i1, gint i2,
-			    gpointer user_data)
+ka_create_gtk_secure_entry (GladeXML *xml G_GNUC_UNUSED,
+			    gchar *func_name G_GNUC_UNUSED,
+			    gchar *name,
+			    gchar *s1 G_GNUC_UNUSED,
+			    gchar *s2 G_GNUC_UNUSED,
+			    gint i1 G_GNUC_UNUSED,
+			    gint i2 G_GNUC_UNUSED,
+			    gpointer user_data G_GNUC_UNUSED)
 {
 	GtkWidget* entry = NULL;
 

Modified: trunk/src/krb5-auth-dialog.h
==============================================================================
--- trunk/src/krb5-auth-dialog.h	(original)
+++ trunk/src/krb5-auth-dialog.h	Wed Mar 11 16:25:58 2009
@@ -26,6 +26,6 @@
 void ka_destroy_cache (GtkMenuItem  *menuitem, gpointer user_data);
 gboolean ka_grab_credentials(KaApplet* applet);
 gboolean ka_check_credentials (KaApplet *applet, const char* principal);
-int ka_tgt_valid_seconds();
+int ka_tgt_valid_seconds(void);
 #endif
 

Modified: trunk/src/krb5-auth-gconf.c
==============================================================================
--- trunk/src/krb5-auth-gconf.c	(original)
+++ trunk/src/krb5-auth-gconf.c	Wed Mar 11 16:25:58 2009
@@ -166,7 +166,7 @@
 
 static void
 ka_gconf_key_changed_callback (GConfClient* client,
-                               guint cnxn_id,
+                               guint cnxn_id G_GNUC_UNUSED,
                                GConfEntry* entry,
                                gpointer user_data)
 {
@@ -193,7 +193,9 @@
 
 
 gboolean
-ka_gconf_init (KaApplet* applet, int argc, char* argv[])
+ka_gconf_init (KaApplet* applet,
+               int argc G_GNUC_UNUSED,
+               char* argv[] G_GNUC_UNUSED)
 {
 	GError *error = NULL;
 	GConfClient* client;

Modified: trunk/src/krb5-auth-pwdialog.c
==============================================================================
--- trunk/src/krb5-auth-pwdialog.c	(original)
+++ trunk/src/krb5-auth-pwdialog.c	Wed Mar 11 16:25:58 2009
@@ -90,7 +90,9 @@
 
 
 static gboolean
-ungrab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
+ungrab_keyboard (GtkWidget *win G_GNUC_UNUSED,
+                 GdkEvent *event,
+                 gpointer data)
 {
 	KaPwDialog* pwdialog = KA_PWDIALOG(data);
 
@@ -185,7 +187,7 @@
 
 void
 ka_pwdialog_setup (KaPwDialog* pwdialog, const gchar *krb5prompt,
-                   gboolean hide_password, gboolean invalid_auth)
+                   gboolean invalid_auth)
 {
 	KaPwDialogPrivate *priv = pwdialog->priv;
 	gchar *wrong_markup = NULL;

Modified: trunk/src/krb5-auth-pwdialog.h
==============================================================================
--- trunk/src/krb5-auth-pwdialog.h	(original)
+++ trunk/src/krb5-auth-pwdialog.h	Wed Mar 11 16:25:58 2009
@@ -53,7 +53,7 @@
 KaPwDialog* ka_pwdialog_create(GladeXML *xml);
 /* setup everything for the next prompting */
 void ka_pwdialog_setup (KaPwDialog* pwdialog, const gchar *krb5prompt,
-                        gboolean hide_password, gboolean invalid_auth);
+                        gboolean invalid_auth);
 gint ka_pwdialog_run(KaPwDialog *applet);
 void ka_pwdialog_hide(const KaPwDialog *applet, gboolean force);
 void ka_pwdialog_set_persist(KaPwDialog *applet, gboolean persist);