Changeset e1624d68b9dc680736c70f027849a9ccbd38b00f

Timestamp:

08/13/08 21:39:16 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

91da217b2205b4a719e5362a9db1a32a77c87b6e, 1be21d4c9b1bd3382ad5718f864668d8434ca7b1

Children:

47755f293fe090ac08774806364759a7f80d808a, 2b3ff5f1d4533d28a6309e5e780c4a1a80d18e10

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-08-13T21:39:16Z+0200

Message:

Merge branch 'master' of ssh://armin@git.0x539.de/srv/git/gobby

Conflicts:

ChangeLog?

Files:

• ChangeLog (modified) (1 diff)
• src/hostdialog.cpp (modified) (3 diffs)
• src/joindialog.cpp (modified) (3 diffs)
• src/header.cpp (modified) (1 diff)
• src/preferences.cpp (modified) (2 diffs)
• src/preferencesdialog.cpp (modified) (2 diffs)

ChangeLog

@@ -6 +6 @@
         are not meant to be shown to the user, and they could cause a crash
         (bug #374).
+
+2008-07-24  Armin Burgmeier  <armin@0x539.de>
+
+        * src/joindialog.cpp:
+        * src/hostdialog.cpp: Added #ifdef GTKMM_ATKMM_ENABLED ... #endif
+        pairs around the atkmm includes and usages, so that gobby builds
+        when atkmm is not enabled in gtkmm.
 
 2008-06-25  Yarek Tyshchenko  <yarek@britishgraphics.co.uk>

src/hostdialog.cpp

@@ -19 +19 @@
 #include <list>
 #include <gtkmm/stock.h>
+
+#ifdef GTKMM_ATKMM_ENABLED
 #include <atkmm/relationset.h>
 #include <atkmm/relation.h>
 #include <atkmm/object.h>
+#endif
+
 #include "common.hpp"
 #include "hostdialog.hpp"
@@ -128 +132 @@
         set_resizable(false);
 
+#ifdef GTKMM_ATKMM_ENABLED
         // Add label associations to get proper accessibility.
         m_lbl_port.get_accessible()->get_relation_set()->set_add(
@@ -149 +154 @@
                         Atk::RELATION_LABEL_FOR)
                 );
+#endif
 }
 

src/joindialog.cpp

@@ -22 +22 @@
 #include <gtkmm/enums.h>
 #include <gtkmm/alignment.h>
+
+#ifdef GTKMM_ATKMM_ENABLED
 #include <atkmm/relationset.h>
 #include <atkmm/relation.h>
 #include <atkmm/object.h>
+#endif
+
 #include "common.hpp"
 #include "joindialog.hpp"
@@ -154 +158 @@
         set_resizable(true);
 
+#ifdef GTKMM_ATKMM_ENABLED
         // Add label associations to get proper accessibility.
         m_lbl_host.get_accessible()->get_relation_set()->set_add(
@@ -175 +180 @@
                         Atk::RELATION_LABEL_FOR)
                 );
+#endif
 }
 

src/header.cpp

@@ -627 +627 @@
                 {
                         GtkSourceLanguage* language = gtk_source_language_manager_get_language(lang_mgr, *id);
-                        lang_list = g_slist_prepend(lang_list, language);
+                        if(!gtk_source_language_get_hidden(language))
+                                lang_list = g_slist_prepend(lang_list, language);
                 }
         }

src/preferences.cpp

@@ -42 +42 @@
                         GtkSourceLanguage* language = gtk_source_language_manager_get_language(manager, *id);
                         g_assert(language != NULL);
+                        if(gtk_source_language_get_hidden(language)) continue;
 
                         gchar** mime_types =
@@ -264 +265 @@
                 {
                         GtkSourceLanguage* language = gtk_source_language_manager_get_language(lang_mgr, *id);
+                        if(gtk_source_language_get_hidden(language)) continue;
 
                         gchar** globs = gtk_source_language_get_globs(language);

src/preferencesdialog.cpp

@@ -366 +366 @@
                 {
                         GtkSourceLanguage* language = gtk_source_language_manager_get_language(lang_mgr, *id);
+                        if(gtk_source_language_get_hidden(language)) continue;
+
                         languages = g_slist_prepend(languages, language);
                 }
@@ -547 +549 @@
                 {
                         GtkSourceLanguage* language = gtk_source_language_manager_get_language(m_lang_mgr, *id);
+                        if(gtk_source_language_get_hidden(language)) continue;
 
                         gchar** mime_types = gtk_source_language_get_mime_types(language);