diff options
author | Jan Lipovsky <janlipovsky@gmail.com> | 2010-05-12 09:29:49 +0200 |
---|---|---|
committer | Jan Lipovsky <janlipovsky@gmail.com> | 2010-05-12 09:29:49 +0200 |
commit | edce1bc175adbd9941f17b73ae2d94fd5ffede93 (patch) | |
tree | 7dc3b2d77bde7347fda1293a11b22a535eb571ae | |
parent | a43a36e44cbda8545576f661d4bb8d2f74e0ba13 (diff) | |
download | sfshare-edce1bc175adbd9941f17b73ae2d94fd5ffede93.tar.gz sfshare-edce1bc175adbd9941f17b73ae2d94fd5ffede93.tar.xz sfshare-edce1bc175adbd9941f17b73ae2d94fd5ffede93.zip |
Code cleanup
-rwxr-xr-x | nautilus-plugin/src/Makefile | 2 | ||||
-rw-r--r-- | sfshare-daemon/src/dbus_service.c | 7 | ||||
-rw-r--r-- | sfshare-daemon/src/samba_share.c | 6 | ||||
-rw-r--r-- | sfshare-gui/data/sfshare_window.ui | 1 | ||||
-rw-r--r-- | sfshare-gui/src/dbus_client.c | 4 | ||||
-rw-r--r-- | sfshare-gui/src/sfshare.c | 6 |
6 files changed, 13 insertions, 13 deletions
diff --git a/nautilus-plugin/src/Makefile b/nautilus-plugin/src/Makefile index dd99da3..99417ec 100755 --- a/nautilus-plugin/src/Makefile +++ b/nautilus-plugin/src/Makefile @@ -1,7 +1,7 @@ TARGET=libnautilus_sfshare.so OBJECTS=nautilus_sfshare.o -LIBDIR=/usr/lib64 +LIBDIR=/usr/lib WFLAGS=-Wall -pedantic -Wmissing-prototypes CFLAGS= $(WFLAGS) -fPIC -g \ $(shell pkg-config --cflags libnautilus-extension glib-2.0) diff --git a/sfshare-daemon/src/dbus_service.c b/sfshare-daemon/src/dbus_service.c index da0cabc..ef986bd 100644 --- a/sfshare-daemon/src/dbus_service.c +++ b/sfshare-daemon/src/dbus_service.c @@ -62,7 +62,6 @@ struct DaemonObjectClass }; - #define DAEMON_TYPE_OBJECT (daemon_object_get_type ()) #define DAEMON_OBJECT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), DAEMON_TYPE_OBJECT, DaemonObject)) #define DAEMON_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DAEMON_TYPE_OBJECT, DaemonObjectClass)) @@ -277,7 +276,7 @@ daemon_get_share_status (DaemonObject *obj, const gchar *path, gchar ***result, Error_sfshare err; - err = smb_get_share_status(path, result); + err = smb_get_share_status (path, result); if (err != OK) { @@ -318,7 +317,7 @@ setup_share_authorized (gpointer data) gboolean daemon_setup_share (DaemonObject *obj,const gchar **parameters, DBusGMethodInvocation *context) { - puts ("daemon_setup_share"); + /* puts ("daemon_setup_share"); */ DaemonData *data; data = daemon_data_new (context, setup_share_authorized, parameters); @@ -367,7 +366,7 @@ delete_share_authorized (gpointer data) gboolean daemon_delete_share (DaemonObject *obj, const gchar *path, DBusGMethodInvocation *context) { - puts("daemon_delete_share"); + /* puts("daemon_delete_share"); */ DaemonData *data; diff --git a/sfshare-daemon/src/samba_share.c b/sfshare-daemon/src/samba_share.c index 592f53e..01c91b8 100644 --- a/sfshare-daemon/src/samba_share.c +++ b/sfshare-daemon/src/samba_share.c @@ -214,7 +214,7 @@ gint check_item(TSmbConfItem *item) * Parse line of smb.conf and fill competent field of item structure */ void -ParseShareItem(gchar *txt, TSmbConfItem *item) +parse_to_share_item (gchar *txt, TSmbConfItem *item) { gchar *lower = g_ascii_strdown(txt, strlen(txt)); gboolean found = FALSE; @@ -404,7 +404,7 @@ load_smb_conf (GPtrArray *shared_items) TSmbConfItem *tmp = g_ptr_array_index(shared_items, arr_index); /* Recognize parameters and fill in item */ - ParseShareItem (line, tmp); + parse_to_share_item (line, tmp); } @@ -467,7 +467,7 @@ share_name_exist (GPtrArray *shared_items, const gchar *sharename) * Write new share section or change chare section defined by share parameter */ gint -write_share(GPtrArray *shared_items, TSmbConfItem *share) +write_share (GPtrArray *shared_items, TSmbConfItem *share) { TSmbConfItem *item; /* Shared item */ diff --git a/sfshare-gui/data/sfshare_window.ui b/sfshare-gui/data/sfshare_window.ui index 650730b..25dc438 100644 --- a/sfshare-gui/data/sfshare_window.ui +++ b/sfshare-gui/data/sfshare_window.ui @@ -8,6 +8,7 @@ <property name="border_width">6</property> <property name="title" translatable="yes">Simple File Share</property> <property name="resizable">False</property> + <property name="window_position">center-on-parent</property> <property name="icon_name">folder-remote</property> <child> <object class="GtkVBox" id="vbox1"> diff --git a/sfshare-gui/src/dbus_client.c b/sfshare-gui/src/dbus_client.c index 6807697..6a4daa3 100644 --- a/sfshare-gui/src/dbus_client.c +++ b/sfshare-gui/src/dbus_client.c @@ -138,7 +138,7 @@ check_authorization_cb (PolkitAuthority *authority, void -polkit_sfshare_check (const gchar *action_id) +polkit_sfshare_check (const gchar *action_id) { subject = polkit_system_bus_name_new (dbus_bus_get_unique_name (dbus_g_connection_get_connection (bus))); @@ -247,3 +247,5 @@ dbus_sfshare_delete_share (const gchar *path) return; } } + + diff --git a/sfshare-gui/src/sfshare.c b/sfshare-gui/src/sfshare.c index a3c8f9f..17bed74 100644 --- a/sfshare-gui/src/sfshare.c +++ b/sfshare-gui/src/sfshare.c @@ -238,7 +238,7 @@ save_share ( void ) /* user want to delete share from smb.conf*/ if (!shared_gui && shared_smbconf) { - dbus_sfshare_delete_share(dir_path); + dbus_sfshare_delete_share (dir_path); return; } @@ -329,8 +329,6 @@ main ( int argc, char **argv ) g_signal_connect (sfsdialog.gui_readonly, "clicked", G_CALLBACK (gui_changed), NULL); g_signal_connect (sfsdialog.gui_guestok, "clicked", G_CALLBACK (gui_changed), NULL); - /* Connect callbacks */ - /* gtk_builder_connect_signals(builder, &sfsdialog ); */ /* Destroy builder */ g_object_unref (G_OBJECT( builder )); @@ -345,7 +343,7 @@ main ( int argc, char **argv ) dbus_sfshare_connect (); polkit_sfshare_init(); - gtk_main(); + gtk_main (); dbus_sfshare_disconnect (); polkit_sfshare_free (); |