Changeset 6c2a697e07ab35b23a0742386214d5c37bec6039

Timestamp:

10/16/08 01:40:56 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

86c32c8ba885e66218f79923a22d968a37125468

Children:

b19be5b08bba0d162c3b6dd1990bb180f7f3c20e

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-10-16T01:40:56Z+0200

Message:

Windows build fixes

2008-10-15 Armin Burgmeier <armin@…>

• code/core/Makefile.am: Added appicondir and pixmapdir back, so that installed pixmaps can be found.

• code/util/resolv.cpp: Set all fields in getaddrinfo hint, otherwise the Win32 implementation of getaddrinfo produces an error.

• code/core/browser.cpp: Commented-out the device name to device index translation for %dev syntax on Windows. It won't be available for now.

• code/core/iconmanager.cpp: Don't load save-all.svg since GTK+ on Win32 has no SVG loader by defualt. Also, locate pixbufs using the non-deprecated g_win32_get_package_installation_directory_of_module function.

• code/core/statusbar.cpp: Added code that undefs ERROR, because this is used in an enum, and seems to be defined somewhere in a Windows header.

• code/dialogs/preferencesdialog.cpp: Don't set current folder of host directory file chooser (which is not shown currently anyway), because this could produce an error message if the directory does not exist.

• code/operations/operation-open.cpp:
• code/operations/operation-save.cpp: Use the C g_iconv API instead of Glib::IConv::iconv, because iconv is a define to libiconv on Windows, but Glib::IConv::libiconv does not exist.

• Makefile.am: Fixed linking order, link to stdc++ and ws2_32 on Windows.

• win32/gobby.rc: Fixed path to gobby.res file.

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• README (modified) (1 diff)
• code/core/Makefile.am (modified) (1 diff)
• code/core/browser.cpp (modified) (3 diffs)
• code/core/iconmanager.cpp (modified) (4 diffs)
• code/core/statusbar.hpp (modified) (1 diff)
• code/dialogs/preferencesdialog.cpp (modified) (1 diff)
• code/operations/operation-open.cpp (modified) (1 diff)
• code/operations/operation-save.cpp (modified) (1 diff)
• code/util/resolv.cpp (modified) (2 diffs)
• win32/gobby.rc (modified) (1 diff)

ChangeLog

@@ +1 @@
+2008-10-15  Armin Burgmeier  <armin@arbur.net>
+
+        * code/core/Makefile.am: Added appicondir and pixmapdir back, so that
+        installed pixmaps can be found.
+
+        * code/util/resolv.cpp: Set all fields in getaddrinfo hint, otherwise
+        the Win32 implementation of getaddrinfo produces an error.
+
+        * code/core/browser.cpp: Commented-out the device name to device index
+        translation for %dev syntax on Windows. It won't be available for now.
+
+        * code/core/iconmanager.cpp: Don't load save-all.svg since GTK+ on
+        Win32 has no SVG loader by defualt. Also, locate pixbufs using the
+        non-deprecated g_win32_get_package_installation_directory_of_module
+        function.
+
+        * code/core/statusbar.cpp: Added code that undefs ERROR, because this
+        is used in an enum, and seems to be defined somewhere in a Windows
+        header.
+
+        * code/dialogs/preferencesdialog.cpp: Don't set current folder of
+        host directory file chooser (which is not shown currently anyway),
+        because this could produce an error message if the directory does not
+        exist.
+
+        * code/operations/operation-open.cpp:
+        * code/operations/operation-save.cpp: Use the C g_iconv API instead of
+        Glib::IConv::iconv, because iconv is a define to libiconv on Windows,
+        but Glib::IConv::libiconv does not exist.
+
+        * Makefile.am: Fixed linking order, link to stdc++ and ws2_32 on
+        Windows.
+
+        * win32/gobby.rc: Fixed path to gobby.res file.
+
 2008-10-15  Armin Burgmeier  <armin@arbur.net>
 

Makefile.am

@@ -8 +8 @@
 bin_PROGRAMS = gobby-0.5
 
-gobby_0_5_LDADD = $(gobby_LIBS) \
+gobby_0_5_LDADD = \
         code/libgobby.a \
         code/commands/libgobby-commands.a \
@@ -14 +14 @@
         code/dialogs/libgobby-dialogs.a \
         code/core/libgobby-core.a \
-        code/util/libgobby-util.a
+        code/util/libgobby-util.a \
+        $(gobby_LIBS)
 
 if WIN32
-gobby_0_5_LDADD += -lole32 -luuid
+# For some reason it does not link against libstdc++ on Windows. Perhaps
+# that's because we don't specify a source file here, so it guesses C.
+gobby_0_5_LDADD += -lws2_32 -lstdc++
 gobby_0_5_LDFLAGS = \
         -Wl,--enable-runtime-pseudo-reloc \

README

@@ -37 +37 @@
      * Syntax highlighting, auto indentation, configurable tab
        width
-     * Multiple documnets in one session
+     * Multiple documents in one session
      * Document subscriptions
      * Zeroconf support (optional)

code/core/Makefile.am

@@ -37 +37 @@
         userlist.hpp
 
+appicondir = $(datadir)/pixmaps
+pixmapdir = $(datadir)/pixmaps/gobby
+
 libgobby_core_a_CPPFLAGS = $(gobby_CFLAGS) -I.. \
                           -DAPPICON_DIR=\""$(appicondir)"\" \

code/core/browser.cpp

@@ -26 +26 @@
 #include <gtkmm/image.h>
 
-#include <net/if.h>
+#ifndef G_OS_WIN32
+# include <net/if.h>
+#endif
 
 Gobby::Browser::Browser(Gtk::Window& parent,
@@ -194 +196 @@
                 str.erase(pos);
 
+#ifdef G_OS_WIN32
+                // TODO: Implement
+                device_index = 0;
+#else
                 device_index = if_nametoindex(device_name.c_str());
                 if(device_index == 0)
@@ -203 +209 @@
                                         device_name), 5);
                 }
+#endif
         }
 

code/core/iconmanager.cpp

@@ -25 +25 @@
 namespace
 {
-        Glib::RefPtr<Gdk::Pixbuf> load_pixbuf(const char* dir, const char* file)
+        Glib::RefPtr<Gdk::Pixbuf>
+        load_pixbuf(const char* dir, const char* file)
         {
                 try
@@ -44 +45 @@
                         else
                                 subdir = "share/pixmaps/gobby";
-                        
-                        path = g_win32_get_package_installation_subdirectory(
-                                subdir);
-                        std::string path_str = path;
+
+                        gchar* path = g_win32_get_package_installation_directory_of_module(NULL);
+
+                        std::string path_str =
+                                Glib::build_filename(path, subdir);
                         g_free(path);
 
@@ -67 +69 @@
 Gtk::StockID Gobby::IconManager::STOCK_SAVE_ALL("gobby-save-all");
 
+// TODO: The save-all icon does not match the save icon for toolbar
+// or menu sized items. It is not yet enabled therefore.
 Gobby::IconManager::IconManager():
         gobby(load_pixbuf(APPICON_DIR, "gobby.png") ),
         userlist(load_pixbuf(PIXMAPS_DIR, "userlist.png") ),
         doclist(load_pixbuf(PIXMAPS_DIR, "doclist.png") ),
-        save_all(load_pixbuf(PIXMAPS_DIR, "save-all.svg")),
+//      save_all(load_pixbuf(PIXMAPS_DIR, "save-all.svg")),
         m_is_userlist(userlist),
         m_is_doclist(doclist),
-        m_is_save_all(save_all),
+//      m_is_save_all(save_all),
         m_icon_factory(Gtk::IconFactory::create() )
 {
@@ -84 +88 @@
 
         Gtk::StockItem save_all_item(STOCK_SAVE_ALL, _("Save All"));
-        // TODO: The save-all icon does not match the save icon for toolbar
-        // or menu sized items. This is not yet enabled therefore.
         //m_icon_factory->add(STOCK_SAVE_ALL, m_is_save_all);
 

code/core/statusbar.hpp

@@ -26 +26 @@
 
 #include <glibmm/ustring.h>
+
+/* ARGH!!! */
+#ifdef G_OS_WIN32
+# ifdef ERROR
+#  undef ERROR
+# endif
+#endif
 
 namespace Gobby

code/dialogs/preferencesdialog.cpp

@@ -268 +268 @@
 
         m_lbl_path_host_directory.show();
-        m_btn_path_host_directory.set_current_folder(
+        // Don't call this as long as we are not showing the dialog, to
+        // prevent spurious error messages when the folder does not exist.
+        /*m_btn_path_host_directory.set_current_folder(
                 static_cast<const std::string&>(
-                        preferences.user.host_directory));
+                        preferences.user.host_directory));*/
         m_btn_path_host_directory.show();
         connect_path_option(m_btn_path_host_directory,

code/operations/operation-open.cpp

@@ -206 +206 @@
         gsize outbytes = CONVERT_BUFFER_SIZE;
 
-        const std::size_t result = m_iconv->iconv(
+        /* iconv is defined as libiconv on Windows, or at least when using the
+         * binary packages from ftp.gnome.org. Therefore we can't propely
+         * call Glib::IConv::iconv. Therefore, we use the C API here. */
+        const std::size_t result = g_iconv(m_iconv->gobj(),
                 &inbuf, &inbytes, &outbuf, &outbytes);
         bool more_to_process = (inbytes != 0);

code/operations/operation-save.cpp

@@ -203 +203 @@
         gchar* preserve_inbuf = inbuf;
 
-        std::size_t retval = m_iconv.iconv(&inbuf, &inlen, &outbuf, &outlen);
+        /* iconv is defined as libiconv on Windows, or at least when using the
+         * binary packages from ftp.gnome.org. Therefore we can't propely
+         * call Glib::IConv::iconv. Therefore, we use the C API here. */
+        std::size_t retval = g_iconv(
+                m_iconv.gobj(), &inbuf, &inlen, &outbuf, &outlen);
 
         if(retval == static_cast<std::size_t>(-1))

code/util/resolv.cpp

@@ -22 +22 @@
 #include <glibmm/thread.h>
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
+#ifdef G_OS_WIN32
+/* This is required to be able to use getaddrinfo with MinGW
+ * I believe this means that we require Windows XP here. */
+# define _WIN32_WINNT 0x0501
+# include <ws2tcpip.h>
+#else
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <netdb.h>
+#endif
 
 struct Gobby::ResolvHandle
@@ -64 +71 @@
         {
                 addrinfo hint;
+#ifdef AI_ADDRCONFIG
                 hint.ai_flags = AI_ADDRCONFIG;
+#else
+                hint.ai_flags = 0;
+#endif
                 hint.ai_family = AF_UNSPEC;
                 hint.ai_socktype = SOCK_STREAM;
                 hint.ai_protocol = 0;
+                hint.ai_addrlen = 0;
+                hint.ai_canonname = NULL;
+                hint.ai_addr = NULL;
+                hint.ai_next = NULL;
 
                 addrinfo* res = NULL;

win32/gobby.rc

@@ -1 @@
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "win32/gobby.ico"
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "gobby.ico"