diff --git a/cmake/PkgConfigWithFallback.cmake b/cmake/PkgConfigWithFallback.cmake index 9124bb35..5522d830 100644 --- a/cmake/PkgConfigWithFallback.cmake +++ b/cmake/PkgConfigWithFallback.cmake @@ -18,7 +18,10 @@ function(find_pkg_config_with_fallback name) find_library(${name}_${lib}_LIBRARY ${lib} HINTS ${${name}_PKG_CONFIG_LIBRARY_DIRS}) mark_as_advanced(${name}_${lib}_LIBRARY) if(NOT ${name}_${lib}_LIBRARY) - unset(${name}_FOUND) + find_library(${name}_${lib}_LIBRARY ${lib} HINTS "C:/msys64/mingw64/x86_64-w64-mingw32/lib") + if(NOT ${name}_${lib}_LIBRARY) + unset(${name}_FOUND) + endif(NOT ${name}_${lib}_LIBRARY) endif(NOT ${name}_${lib}_LIBRARY) endforeach(lib) if(${name}_FOUND) diff --git a/cmake/PkgConfigWithFallbackOnConfigScript.cmake b/cmake/PkgConfigWithFallbackOnConfigScript.cmake index 4bc94a33..c8d751ce 100644 --- a/cmake/PkgConfigWithFallbackOnConfigScript.cmake +++ b/cmake/PkgConfigWithFallbackOnConfigScript.cmake @@ -18,7 +18,10 @@ function(find_pkg_config_with_fallback_on_config_script name) find_library(${name}_${lib}_LIBRARY ${lib} HINTS ${${name}_PKG_CONFIG_LIBRARY_DIRS}) mark_as_advanced(${name}_${lib}_LIBRARY) if(NOT ${name}_${lib}_LIBRARY) - unset(${name}_FOUND) + find_library(${name}_${lib}_LIBRARY ${lib} HINTS "C:/msys64/mingw64/x86_64-w64-mingw32/lib") + if(NOT ${name}_${lib}_LIBRARY) + unset(${name}_FOUND) + endif(NOT ${name}_${lib}_LIBRARY) endif(NOT ${name}_${lib}_LIBRARY) endforeach(lib) if(${name}_FOUND) diff --git a/main/src/ui/main_window.vala b/main/src/ui/main_window.vala index ca352b53..e3284ad9 100644 --- a/main/src/ui/main_window.vala +++ b/main/src/ui/main_window.vala @@ -54,10 +54,16 @@ public class MainWindow : Gtk.Window { } private void setup_unified() { - new Dino.Ui.ConversationSelector(); - new Dino.Ui.ConversationSummary.ConversationView(); - new Dino.Ui.ChatInput.View(); - new Dino.Ui.GlobalSearch(); + { + new Dino.Ui.ConversationSelector(); + new Dino.Ui.ConversationSummary.ConversationView(); + new Dino.Ui.ChatInput.View(); + new Dino.Ui.GlobalSearch(); + new Dino.Ui.ConversationView(); + new Dino.Ui.SizeRequestBox(); + new Dino.Ui.SizingBin(); + } + Builder builder = new Builder.from_resource("/im/dino/Dino/unified_main_content.ui"); paned = (Paned) builder.get_object("paned"); box.add(paned);