[haiku-commits] r37183 - haiku/trunk/src/apps/pulse

  • From: wpjvandermeer@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 20 Jun 2010 06:31:37 +0200 (CEST)

Author: wim
Date: 2010-06-20 06:31:37 +0200 (Sun, 20 Jun 2010)
New Revision: 37183
Changeset: http://dev.haiku-os.org/changeset/37183/haiku
Ticket: http://dev.haiku-os.org/ticket/6198

Modified:
   haiku/trunk/src/apps/pulse/PulseApp.cpp
   haiku/trunk/src/apps/pulse/PulseApp.h
Log:
BCatalog was used in the wrong way. Fixes ticket #6198.

Modified: haiku/trunk/src/apps/pulse/PulseApp.cpp
===================================================================
--- haiku/trunk/src/apps/pulse/PulseApp.cpp     2010-06-20 03:49:23 UTC (rev 
37182)
+++ haiku/trunk/src/apps/pulse/PulseApp.cpp     2010-06-20 04:31:37 UTC (rev 
37183)
@@ -37,6 +37,8 @@
 PulseApp::PulseApp(int argc, char **argv)
        : BApplication(APP_SIGNATURE)
 {
+       be_locale->GetAppCatalog(&fCatalog);
+
        prefs = new Prefs();
 
        int mini = false, deskbar = false, normal = false;
@@ -246,10 +248,6 @@
 int
 main(int argc, char **argv)
 {
-       BCatalog fAppCatalog;
-       
-       be_locale->GetAppCatalog(&fAppCatalog);
-
        PulseApp *pulseapp = new PulseApp(argc, argv);
        pulseapp->Run();
        delete pulseapp;

Modified: haiku/trunk/src/apps/pulse/PulseApp.h
===================================================================
--- haiku/trunk/src/apps/pulse/PulseApp.h       2010-06-20 03:49:23 UTC (rev 
37182)
+++ haiku/trunk/src/apps/pulse/PulseApp.h       2010-06-20 04:31:37 UTC (rev 
37183)
@@ -12,19 +12,23 @@
 #define PULSEAPP_H
 
 
-#include <app/Application.h>
+#include <Application.h>
+#include <Catalog.h>
+
 #include "Prefs.h"
 
 
 class PulseApp : public BApplication {
-       public:
-               PulseApp(int argc, char **argv);
-               ~PulseApp();
+public:
+                                               PulseApp(int argc, char **argv);
+                                               ~PulseApp();
 
-               Prefs *prefs;
+                       Prefs*          prefs;
 
-       private:
-               void BuildPulse();
+private:
+                       void            BuildPulse();
+               
+                       BCatalog        fCatalog;
 };
 
 extern bool LastEnabledCPU(int cpu);


Other related posts:

  • » [haiku-commits] r37183 - haiku/trunk/src/apps/pulse - wpjvandermeer