From 78abd4cb84a96eba55cdb817489152deb2bcf2a2 Mon Sep 17 00:00:00 2001
From: ketmar <ketmar@ketmar.no-ip.org>
Date: Sat, 14 Sep 2013 09:47:56 +0300
Subject: [PATCH] cosmetix

---
 src/conf.h     |  4 ++--
 src/music.c    | 46 +++++++++++++++++-----------------------------
 src/music.h    | 19 ++++++++++++-------
 src/settings.c |  2 +-
 4 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/src/conf.h b/src/conf.h
index 6826b74..b80a6d9 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -69,8 +69,8 @@ enum {
 
 
 typedef struct {
-  char *label;
-  char *command;
+  const char *label;
+  const char *command;
 } CommandList;
 
 
diff --git a/src/music.c b/src/music.c
index 9249294..bb93cd7 100644
--- a/src/music.c
+++ b/src/music.c
@@ -1,63 +1,54 @@
 /* logjam - a GTK client for LiveJournal.
  * Copyright (C) 2000-2003 Evan Martin <evan@livejournal.com>
- *
- * vim: tabstop=4 shiftwidth=4 noexpandtab :
  */
-
 #include "gtk-all.h"
 
 #include "conf.h"
 #include "music.h"
 
+
 const CommandList music_commands[] = {
-  { N_("None"), NULL },
-  { "Music Player Daemon", "sh -c \"mpc | grep -v '^volume: .* repeat: .* random: .*'\"" },
-  { "Rhythmbox", "rhythmbox --print-playing" },
-  { "XMMS / Beep", "logjam-xmms-client" },
-  { "amaroK", "dcop amarok player nowPlaying" },
-  { NULL, NULL }
+  {N_("None"), NULL},
+  {"Music Player Daemon", "sh -c \"mpc | grep -v '^volume: .* repeat: .* random: .*'\""},
+  {"Rhythmbox", "rhythmbox --print-playing"},
+  {"XMMS / Beep", "logjam-xmms-client"},
+  {"amaroK", "dcop amarok player nowPlaying"},
+  {NULL, NULL}
 };
 
-MusicSource
-music_current_source(void) {
+MusicSource music_current_source(void) {
   int i;
 
   if (!conf.music_command)
     return MUSIC_SOURCE_NONE;
 
   for (i = 0; i < MUSIC_SOURCE_COUNT; i++) {
-    if (music_commands[i].label && music_commands[i].command &&
-        (strcmp(music_commands[i].command, conf.music_command) == 0))
+    if (music_commands[i].label && music_commands[i].command && (strcmp(music_commands[i].command, conf.music_command) == 0))
       return i;
   }
   return MUSIC_SOURCE_CUSTOM;
 }
 
-GQuark
-music_error_quark(void) {
+GQuark music_error_quark(void) {
   static GQuark quark = 0;
   if (quark == 0)
     quark = g_quark_from_static_string("music-error-quark");
   return quark;
 }
 
-static gboolean
-music_command_can_detect(GError **err) {
+static gboolean music_command_can_detect(GError **err) {
   if (!conf.music_command || !conf.music_command[0]) {
-    g_set_error(err, MUSIC_ERROR, MUSIC_COMMAND_LINE_ERROR, "%s",
-        _("No music command line is set."));
+    g_set_error(err, MUSIC_ERROR, MUSIC_COMMAND_LINE_ERROR, "%s", _("No music command line is set."));
     return FALSE;
   }
   return TRUE;
 }
 
-static char*
-music_command_detect(const char *command, GError **err) {
+static char *music_command_detect(const char *command, GError **err) {
   gchar *std_out, *std_err, *p, *cnv;
   gint exit_status;
 
-  if (!g_spawn_command_line_sync(command,
-      &std_out, &std_err, &exit_status, err))
+  if (!g_spawn_command_line_sync(command, &std_out, &std_err, &exit_status, err))
     return NULL;
 
   if (exit_status != 0) {
@@ -75,8 +66,7 @@ music_command_detect(const char *command, GError **err) {
     }
   }
   if (p == std_out) {
-    g_set_error(err, MUSIC_ERROR, MUSIC_COMMAND_ERROR, "%s",
-        _("Command produced no output."));
+    g_set_error(err, MUSIC_ERROR, MUSIC_COMMAND_ERROR, "%s", _("Command produced no output."));
     g_free(std_out);
     return NULL;
   }
@@ -89,13 +79,11 @@ music_command_detect(const char *command, GError **err) {
   return cnv;
 }
 
-gboolean
-music_can_detect(GError **err) {
+gboolean music_can_detect(GError **err) {
   return music_command_can_detect(err);
 }
 
-char*
-music_detect(GError **err) {
+char *music_detect(GError **err) {
   if (conf.music_command)
     return music_command_detect(conf.music_command, err);
   return NULL;
diff --git a/src/music.h b/src/music.h
index 90b9cc6..63684c6 100644
--- a/src/music.h
+++ b/src/music.h
@@ -4,7 +4,8 @@
 #ifndef __LOGJAM_MUSIC_H__
 #define __LOGJAM_MUSIC_H__
 
-#include "conf.h"               /* CommandList */
+#include "conf.h"
+
 
 typedef enum {
   MUSIC_SOURCE_NONE,
@@ -14,20 +15,24 @@ typedef enum {
   MUSIC_SOURCE_COUNT
 } MusicSource;
 
+
 extern const CommandList music_commands[];
 
+
 typedef enum {
   MUSIC_COMMAND_ERROR,
   MUSIC_COMMAND_LINE_ERROR,
   MUSIC_UNIMPLEMENTED_ERROR
 } MusicError;
 
-gboolean music_can_detect(GError ** err);
-char *music_detect(GError ** err);
 
-GQuark music_error_quark(void);
-#define MUSIC_ERROR music_error_quark()
+extern gboolean music_can_detect (GError **err);
+extern char *music_detect (GError **err);
+
+extern GQuark music_error_quark (void);
+#define MUSIC_ERROR  music_error_quark()
+
+extern MusicSource music_current_source (void);
 
-MusicSource music_current_source(void);
 
-#endif /* music_h */
+#endif
diff --git a/src/settings.c b/src/settings.c
index 2ba35ee..e1f705b 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -232,7 +232,7 @@ command_make(SettingsWidget *sw) {
 
   menu = gtk_menu_new();
   for (i = 0; cmds[i].label; i++) {
-    char *curcmd = cmds[i].command;
+    const char *curcmd = cmds[i].command;
     gtk_menu_shell_append(GTK_MENU_SHELL(menu),
         gtk_menu_item_new_with_label(_(cmds[i].label)));
     if (cur == -1 &&
-- 
2.11.4.GIT