[Xfce4-commits] <libxfce4ui:new-sm-client> fix some prototypes

[Brian J. Tarricone]

Updating branch refs/heads/kelnos/new-sm-client
         to 53a05e42bb84aa0ab31e41b7cb2f86f002b788ba (commit)
       from 0c53e720e629cb50b10b357d787167ff8520090f (commit)

commit 53a05e42bb84aa0ab31e41b7cb2f86f002b788ba
Author: Brian J. Tarricone <brian at tarricone.org>
Date:   Mon Sep 14 22:02:29 2009 -0700

    fix some prototypes

 docs/tmpl/xfce-sm-client.sgml |   16 ++++++++--------
 libxfce4ui/xfce-sm-client.c   |    4 ++--
 libxfce4ui/xfce-sm-client.h   |   24 ++++++++++++++++--------
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/docs/tmpl/xfce-sm-client.sgml b/docs/tmpl/xfce-sm-client.sgml
index fd8f729..b68c55b 100644
--- a/docs/tmpl/xfce-sm-client.sgml
+++ b/docs/tmpl/xfce-sm-client.sgml
@@ -195,7 +195,7 @@ xfce-sm-client
 </para>
 
 @sm_client: 
- at value: 
+ at clone_command: 
 
 
 <!-- ##### FUNCTION xfce_sm_client_get_current_directory ##### -->
@@ -213,7 +213,7 @@ xfce-sm-client
 </para>
 
 @sm_client: 
- at value: 
+ at current_directory: 
 
 
 <!-- ##### FUNCTION xfce_sm_client_get_discard_command ##### -->
@@ -231,7 +231,7 @@ xfce-sm-client
 </para>
 
 @sm_client: 
- at value: 
+ at discard_command: 
 
 
 <!-- ##### FUNCTION xfce_sm_client_get_priority ##### -->
@@ -249,7 +249,7 @@ xfce-sm-client
 </para>
 
 @sm_client: 
- at value: 
+ at priority: 
 
 
 <!-- ##### FUNCTION xfce_sm_client_get_program ##### -->
@@ -267,7 +267,7 @@ xfce-sm-client
 </para>
 
 @sm_client: 
- at value: 
+ at program: 
 
 
 <!-- ##### FUNCTION xfce_sm_client_get_resign_command ##### -->
@@ -285,7 +285,7 @@ xfce-sm-client
 </para>
 
 @sm_client: 
- at value: 
+ at resign_command: 
 
 
 <!-- ##### FUNCTION xfce_sm_client_get_restart_command ##### -->
@@ -303,7 +303,7 @@ xfce-sm-client
 </para>
 
 @sm_client: 
- at value: 
+ at restart_command: 
 
 
 <!-- ##### FUNCTION xfce_sm_client_get_restart_style ##### -->
@@ -339,6 +339,6 @@ xfce-sm-client
 </para>
 
 @sm_client: 
- at value: 
+ at shutdown_command: 
 
 
diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c
index 027ce97..232f4b3 100644
--- a/libxfce4ui/xfce-sm-client.c
+++ b/libxfce4ui/xfce-sm-client.c
@@ -1358,7 +1358,7 @@ xfce_sm_client_get()
 }
 
 /**
- * xfce_sm_client_new_with_argv:
+ * xfce_sm_client_get_with_argv:
  * @argc: The number of arguments passed to main()
  * @argv: The argument vector passed to main()
  * @restart_style: An #XfceSMClientRestartStyle
@@ -1378,7 +1378,7 @@ xfce_sm_client_get()
  * Returns: A new #XfceSMClient instance
  **/
 XfceSMClient *
-xfce_sm_client_new_with_argv(guint argc,
+xfce_sm_client_get_with_argv(guint argc,
                              gchar **argv,
                              XfceSMClientRestartStyle restart_style,
                              gchar priority)
diff --git a/libxfce4ui/xfce-sm-client.h b/libxfce4ui/xfce-sm-client.h
index e44cd7e..a0e4859 100644
--- a/libxfce4ui/xfce-sm-client.h
+++ b/libxfce4ui/xfce-sm-client.h
@@ -118,28 +118,36 @@ void xfce_sm_client_set_restart_style(XfceSMClient *sm_client,
                                       XfceSMClientRestartStyle restart_style);
 XfceSMClientRestartStyle xfce_sm_client_get_restart_style(XfceSMClient *sm_client);
 
-void xfce_sm_client_set_priority(XfceSMClient *sm_client, gchar value);
+void xfce_sm_client_set_priority(XfceSMClient *sm_client,
+                                 gchar priority);
 gchar xfce_sm_client_get_priority(XfceSMClient *sm_client);
 
-void xfce_sm_client_set_current_directory(XfceSMClient *sm_client, gchar const* value);
+void xfce_sm_client_set_current_directory(XfceSMClient *sm_client,
+                                          const gchar *current_directory);
 G_CONST_RETURN gchar *xfce_sm_client_get_current_directory(XfceSMClient *sm_client);
 
-void xfce_sm_client_set_program(XfceSMClient *sm_client, gchar const* value);
+void xfce_sm_client_set_program(XfceSMClient *sm_client,
+                                const gchar *program);
 G_CONST_RETURN gchar *xfce_sm_client_get_program(XfceSMClient *sm_client);
 
-void xfce_sm_client_set_clone_command(XfceSMClient *sm_client, gchar** const value);
+void xfce_sm_client_set_clone_command(XfceSMClient *sm_client,
+                                      gchar **clone_command);
 gchar **xfce_sm_client_get_clone_command(XfceSMClient *sm_client);
 
-void xfce_sm_client_set_resign_command(XfceSMClient *sm_client, gchar** const value);
+void xfce_sm_client_set_resign_command(XfceSMClient *sm_client,
+                                       gchar **resign_command);
 gchar **xfce_sm_client_get_resign_command(XfceSMClient *sm_client);
 
-void xfce_sm_client_set_restart_command(XfceSMClient *sm_client, gchar** const value);
+void xfce_sm_client_set_restart_command(XfceSMClient *sm_client,
+                                        gchar **restart_command);
 gchar **xfce_sm_client_get_restart_command(XfceSMClient *sm_client);
 
-void xfce_sm_client_set_discard_command(XfceSMClient *sm_client, gchar** const value);
+void xfce_sm_client_set_discard_command(XfceSMClient *sm_client,
+                                        gchar **discard_command);
 gchar **xfce_sm_client_get_discard_command(XfceSMClient *sm_client);
 
-void xfce_sm_client_set_shutdown_command(XfceSMClient *sm_client, gchar** const value);
+void xfce_sm_client_set_shutdown_command(XfceSMClient *sm_client,
+                                         gchar **shutdown_command);
 gchar **xfce_sm_client_get_shutdown_command(XfceSMClient *sm_client);
 
 G_END_DECLS