paperbox r148 - in trunk: . src

[markoa svn gnome org]

Author: markoa
Date: Thu May  1 11:27:23 2008
New Revision: 148
URL: http://svn.gnome.org/viewvc/paperbox?rev=148&view=rev

Log:
Version in window title, fix compiler warnings

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/file-utils.cc
   trunk/src/main-window.cc
   trunk/src/tracker-phone.cc

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu May  1 11:27:23 2008
@@ -1,6 +1,6 @@
 ### Copyright (C) 2007 Marko Anastasov
 
-AC_INIT([paperbox], [0.2.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=paperbox], [paperbox])
+AC_INIT([PaperBox], [0.2.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=paperbox], [paperbox])
 AC_PREREQ(2.59)
 
 AC_CONFIG_SRCDIR([src/main.cc])

Modified: trunk/src/file-utils.cc
==============================================================================
--- trunk/src/file-utils.cc	(original)
+++ trunk/src/file-utils.cc	Thu May  1 11:27:23 2008
@@ -48,7 +48,7 @@
                                Glib::ustring& modtime_string)
     {
         GFile* file;
-        GFileQueryInfoFlags flags;
+        GFileQueryInfoFlags flags = G_FILE_QUERY_INFO_NONE;
         GFileInfo* info;
         GError* error = 0;
 

Modified: trunk/src/main-window.cc
==============================================================================
--- trunk/src/main-window.cc	(original)
+++ trunk/src/main-window.cc	Thu May  1 11:27:23 2008
@@ -20,12 +20,14 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <config.h>
 #include <iostream>
 #include <list>
 #include <map>
 #include <vector>
 #include <glib/gi18n.h>
 #include <glibmm/markup.h>
+#include <glibmm-utils/ustring.h>
 #include <gtkmm-utils/tile.h>
 #include "browser.hh"
 #include "category-editor.hh"
@@ -159,6 +161,8 @@
 
         right_vpane_->set_position(280);
 
+        set_title(Glib::Util::uprintf("%s %s", PACKAGE_NAME, PACKAGE_VERSION));
+
         show_all_children();
     }
 

Modified: trunk/src/tracker-phone.cc
==============================================================================
--- trunk/src/tracker-phone.cc	(original)
+++ trunk/src/tracker-phone.cc	Thu May  1 11:27:23 2008
@@ -34,7 +34,7 @@
 
     static const int DOC_RETRIEVAL_LIMIT = 100000;
 
-    static char* doc_types[] =
+    static const char* doc_types[] =
     {
         "application/x-abiword",
         "application/pdf",
@@ -58,7 +58,7 @@
         NULL
     };
 
-    static char* doc_keys[] =
+    static const char* doc_keys[] =
     {
 	"File:Name",
 	"Doc:Subject",
@@ -301,7 +301,7 @@
 
         tracker_files_get_by_mime_type_async (tracker_connection_,
                                               live_query_id,
-                                              doc_types,
+                                              const_cast<char**>(doc_types),
                                               offset,
                                               max_hits,
                                               (TrackerArrayReply)
@@ -331,7 +331,7 @@
         results = tracker_metadata_get(tracker_connection_,
                                        SERVICE_DOCUMENTS,
                                        uri.c_str(),
-                                       doc_keys,
+                                       const_cast<char**>(doc_keys),
                                        &error);
 
         if (error) {