moake one sfunction static; style fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

5 files changed, 15 insertions, 18 deletions

diff --git a/configure.ac b/configure.ac
index 3e5faf1c..ff427536 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ AC_CHECK_HEADER([sys/inotify.h], [],
 
 AC_CHECK_HEADER([magic.h], [],
    [AC_MSG_ERROR([magic.h is needed to build abrt])])
-   
+
 
 CONF_DIR='${sysconfdir}/${PACKAGE_NAME}'
 VAR_RUN='${localstatedir}/run'
diff --git a/inc/CrashTypesSocket.h b/inc/CrashTypesSocket.h
index df71f4d8..166a8a81 100644
--- a/inc/CrashTypesSocket.h
+++ b/inc/CrashTypesSocket.h
@@ -77,8 +77,6 @@ inline std::string crash_report_to_string(const map_crash_report_t& pCrashReport
     return crash_data_to_string(pCrashReport);
 }
 
-int get_number_from_string(const std::string& pMessage, int& len);
-
 vector_crash_infos_t string_to_crash_infos(const std::string& pMessage);
 map_crash_data_t string_to_crash_data(const std::string& pMessage, int& len);
 inline map_crash_report_t string_to_crash_report(const std::string& pMessage)
diff --git a/lib/Utils/CrashTypesSocket.cpp b/lib/Utils/CrashTypesSocket.cpp
index dccd4b04..dbbc1634 100644
--- a/lib/Utils/CrashTypesSocket.cpp
+++ b/lib/Utils/CrashTypesSocket.cpp
@@ -99,7 +99,7 @@ std::string crash_infos_to_string(const vector_crash_infos_t& pCrashInfos)
     return sCI.str();
 }
 
-int get_number_from_string(const std::string& pMessage, int& len)
+static int get_number_from_string(const std::string& pMessage, int& len)
 {
     std::string sNumber = "";
 
diff --git a/src/Applet/CCApplet.cpp b/src/Applet/CCApplet.cpp
index 0fb4c9ff..3893c77a 100644
--- a/src/Applet/CCApplet.cpp
+++ b/src/Applet/CCApplet.cpp
@@ -42,7 +42,7 @@
 
 static const char *DBUS_SERVICE_NAME = "org.freedesktop.DBus";
 static const char *DBUS_SERVICE_PATH = "/org/freedesktop/DBus";
-const gchar *CApplet::menu_xml = 
+const gchar *CApplet::menu_xml =
         "<?xml version=\"1.0\"?>\
 <interface>\
   <requires lib=\"gtk+\" version=\"2.16\"/>\
@@ -135,18 +135,18 @@ CApplet::CApplet(DBus::Connection &system, DBus::Connection &session, const char
     g_signal_connect(G_OBJECT(m_pStatusIcon), "popup_menu", GTK_SIGNAL_FUNC(CApplet::OnMenuPopup_cb), this);
     SetIconTooltip(_("Pending events: %i"), m_mapEvents.size());
     m_pBuilder = gtk_builder_new();
-    if(gtk_builder_add_from_string(m_pBuilder, menu_xml, strlen(menu_xml), NULL))
-    //if(gtk_builder_add_from_file(m_pBuilder, "popup.GtkBuilder", NULL))
+    if (gtk_builder_add_from_string(m_pBuilder, menu_xml, strlen(menu_xml), NULL))
+    //if (gtk_builder_add_from_file(m_pBuilder, "popup.GtkBuilder", NULL))
     {
         m_pMenu = gtk_builder_get_object(m_pBuilder, "popup_menu");
         //gtk_menu_attach_to_widget(GTK_MENU(m_pMenu), GTK_WIDGET(m_pStatusIcon), NULL);
         m_pmiHide = gtk_builder_get_object(m_pBuilder, "miHide");
-        if(m_pmiHide != NULL)
+        if (m_pmiHide != NULL)
         {
             g_signal_connect(m_pmiHide,"activate", G_CALLBACK(CApplet::onHide_cb), this);
         }
         m_pmiQuit = gtk_builder_get_object(m_pBuilder, "miQuit");
-        if(m_pmiQuit != NULL)
+        if (m_pmiQuit != NULL)
         {
             g_signal_connect(m_pmiQuit,"activate",G_CALLBACK(gtk_main_quit),NULL);
         }
@@ -155,7 +155,6 @@ CApplet::CApplet(DBus::Connection &system, DBus::Connection &session, const char
         {
             g_signal_connect(m_pmiAbout,"activate",G_CALLBACK(CApplet::onAbout_cb),m_pAboutDialog);
         }
-        
     }
     else
     {
@@ -171,7 +170,7 @@ CApplet::~CApplet()
 /* dbus related */
 void CApplet::Crash(const std::string& progname, const std::string& uid  )
 {
-    if(m_pSessionDBus->has_name("com.redhat.abrt.gui"))
+    if (m_pSessionDBus->has_name("com.redhat.abrt.gui"))
     {
         return;
     }
@@ -182,8 +181,8 @@ void CApplet::Crash(const std::string& progname, const std::string& uid  )
             std::istringstream input_string(uid);
             uid_t num;
             input_string >> num;
-    
-            if( (num == getuid()) )
+
+            if (num == getuid())
                 m_pCrashHandler(progname.c_str());
         }
         else
@@ -246,9 +245,9 @@ void CApplet::CrashNotify(const char *format, ...)
     va_end(args);
 
     notify_notification_update(m_pNotification, _("Warning"), buf, NULL);
-    if(gtk_status_icon_is_embedded (m_pStatusIcon))
+    if (gtk_status_icon_is_embedded (m_pStatusIcon))
         notify_notification_show(m_pNotification, &err);
-    if(err != NULL)
+    if (err != NULL)
         g_print(err->message);
 }
 
@@ -279,7 +278,7 @@ void CApplet::OnMenuPopup_cb(GtkStatusIcon *status_icon,
                             guint          activate_time,
                             gpointer       user_data)
 {
-    if(((CApplet *)user_data)->m_pMenu != NULL)
+    if (((CApplet *)user_data)->m_pMenu != NULL)
     {
         gtk_menu_popup(GTK_MENU(((CApplet *)user_data)->m_pMenu),NULL,NULL,gtk_status_icon_position_menu,status_icon,button,activate_time);
     }
@@ -299,7 +298,7 @@ void CApplet::onHide_cb(GtkMenuItem *menuitem, gpointer applet)
 
 void CApplet::onAbout_cb(GtkMenuItem *menuitem, gpointer dialog)
 {
-    if(dialog)
+    if (dialog)
         gtk_dialog_run(GTK_DIALOG(dialog));
     gtk_widget_hide(GTK_WIDGET(dialog));
 }
diff --git a/src/Daemon/org.fedoraproject.abrt.policy b/src/Daemon/org.fedoraproject.abrt.policy
index 43ebf1ff..2cfa8c6e 100644
--- a/src/Daemon/org.fedoraproject.abrt.policy
+++ b/src/Daemon/org.fedoraproject.abrt.policy
@@ -14,7 +14,7 @@ Copyright (c) 2009 Red Hat inc.
 <policyconfig>
   <vendor>The ABRT Team</vendor>
   <vendor_url>https://fedorahosted.org/abrt/</vendor_url>
-  
+
   <action id="org.fedoraproject.abrt.change-daemon-settings">
     <description>Manage settings</description>
     <message>Changing the global settings requires authentication</message>