Date: Tue, 4 Apr 2017 15:24:25 -0400 From: Jung-uk Kim <jkim@FreeBSD.org> To: Baptiste Daroussin <bapt@FreeBSD.org> Cc: FreeBSD Gnome <freebsd-gnome@freebsd.org> Subject: Re: svn commit: r437481 - head/devel/glibmm Message-ID: <8bfb3e1c-54e4-0511-9cb2-8a54e16b8266@FreeBSD.org> In-Reply-To: <201704012058.v31KwtEb072780@repo.freebsd.org> References: <201704012058.v31KwtEb072780@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --EcdQCEnuQokDFGCg5U4uUpIhlJkeQtNlm Content-Type: multipart/mixed; boundary="alOLjArbwqMtmrPr8FHICiS2jHiKok76J"; protected-headers="v1" From: Jung-uk Kim <jkim@FreeBSD.org> To: Baptiste Daroussin <bapt@FreeBSD.org> Cc: FreeBSD Gnome <freebsd-gnome@freebsd.org> Message-ID: <8bfb3e1c-54e4-0511-9cb2-8a54e16b8266@FreeBSD.org> Subject: Re: svn commit: r437481 - head/devel/glibmm References: <201704012058.v31KwtEb072780@repo.freebsd.org> In-Reply-To: <201704012058.v31KwtEb072780@repo.freebsd.org> --alOLjArbwqMtmrPr8FHICiS2jHiKok76J Content-Type: multipart/mixed; boundary="------------7EB28BCCD6C1B93C3506CE5E" Content-Language: en-GB This is a multi-part message in MIME format. --------------7EB28BCCD6C1B93C3506CE5E Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 04/01/2017 16:58, Baptiste Daroussin wrote: > Author: bapt > Date: Sat Apr 1 20:58:55 2017 > New Revision: 437481 > URL: https://svnweb.freebsd.org/changeset/ports/437481 >=20 > Log: > Update to 2.50.0 =2E.. This commit broke deskutils/gnote: http://beefy6.nyi.freebsd.org/data/103amd64-default/437677/logs/gnote-3.1= 8.1_3.log http://beefy5.nyi.freebsd.org/data/103i386-default/437677/logs/gnote-3.18= =2E1_3.log http://beefy9.nyi.freebsd.org/data/110amd64-default/437677/logs/gnote-3.1= 8.1_3.log http://beefy10.nyi.freebsd.org/data/110i386-default/437677/logs/gnote-3.1= 8.1_3.log http://beefy12.nyi.freebsd.org/data/head-amd64-default/p437677_s316479/lo= gs/gnote-3.18.1_3.log http://beefy11.nyi.freebsd.org/data/head-i386-default/p437677_s316479/log= s/gnote-3.18.1_3.log This upstream commit was the culprit: https://git.gnome.org/browse/glibmm/commit/?id=3Daee3a6f and there was an upstream PR for this issue: https://bugzilla.gnome.org/show_bug.cgi?id=3D770541 Fortunately, it was fixed by this commit: https://git.gnome.org/browse/gnote/commit/?id=3Ddf504af I backported the fix to Gnote 3.18 branch. Please see the attached patch= =2E Cheers, Jung-uk Kim --------------7EB28BCCD6C1B93C3506CE5E Content-Type: text/x-patch; name="gnote.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="gnote.diff" Index: deskutils/gnote/files/patch-src_actionmanager.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/gnote/files/patch-src_actionmanager.cpp (nonexistent) +++ deskutils/gnote/files/patch-src_actionmanager.cpp (working copy) @@ -0,0 +1,23 @@ +--- src/actionmanager.cpp.orig 2015-11-28 15:45:18 UTC ++++ src/actionmanager.cpp +@@ -177,17 +177,17 @@ namespace gnote { +=20 + int pos =3D 0; + Glib::RefPtr<Gio::Menu> section =3D make_app_menu_section(APP_ACTIO= N_NEW); +- if(section !=3D 0) { ++ if(section) { + menu->insert_section(pos++, section); + } +=20 + section =3D make_app_menu_section(APP_ACTION_MANAGE); +- if(section !=3D 0) { ++ if(section) { + menu->insert_section(pos++, section); + } +=20 + section =3D make_app_menu_section(APP_ACTION_LAST); +- if(section !=3D 0) { ++ if(section) { + menu->insert_section(pos++, section); + } +=20 Property changes on: deskutils/gnote/files/patch-src_actionmanager.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: deskutils/gnote/files/patch-src_addins_exporttogtg_exporttogtgnote= addin.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/gnote/files/patch-src_addins_exporttogtg_exporttogtgnoteadd= in.cpp (nonexistent) +++ deskutils/gnote/files/patch-src_addins_exporttogtg_exporttogtgnoteadd= in.cpp (working copy) @@ -0,0 +1,24 @@ +--- src/addins/exporttogtg/exporttogtgnoteaddin.cpp.orig 2015-11-28 15:4= 4:34 UTC ++++ src/addins/exporttogtg/exporttogtgnoteaddin.cpp +@@ -79,10 +79,10 @@ void ExportToGTGNoteAddin::on_note_opene + void ExportToGTGNoteAddin::export_button_clicked() + { + try { +- if (s_gtg_interface =3D=3D 0) { ++ if (!s_gtg_interface) { + Glib::RefPtr<Gio::DBus::NodeInfo> node_info =3D Gio::DBus::NodeIn= fo::create_for_xml(GTG_INTERFACE); + s_gtg_interface =3D node_info->lookup_interface("org.gnome.GTG");= +- if(s_gtg_interface =3D=3D 0) { ++ if(!s_gtg_interface) { + ERR_OUT(_("GTG XML loaded, but interface not found")); + return; + } +@@ -96,7 +96,7 @@ void ExportToGTGNoteAddin::export_button + try { + Glib::RefPtr<Gio::DBus::Proxy> proxy =3D Gio::DBus::Proxy::create_f= or_bus_sync( + Gio::DBus::BUS_TYPE_SESSION, "org.gnome.GTG", "/org/gnome/GTG",= "org.gnome.GTG", s_gtg_interface); +- if(proxy =3D=3D 0) { ++ if(!proxy) { + ERR_OUT(_("Failed to create D-Bus proxy for GTG")); + return; + } Property changes on: deskutils/gnote/files/patch-src_addins_exporttogtg_e= xporttogtgnoteaddin.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: deskutils/gnote/files/patch-src_addins_printnotes_printnotesnotead= din.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/gnote/files/patch-src_addins_printnotes_printnotesnoteaddin= =2Ecpp (nonexistent) +++ deskutils/gnote/files/patch-src_addins_printnotes_printnotesnoteaddin= =2Ecpp (working copy) @@ -0,0 +1,11 @@ +--- src/addins/printnotes/printnotesnoteaddin.cpp.orig 2015-11-28 15:44:= 34 UTC ++++ src/addins/printnotes/printnotesnoteaddin.cpp +@@ -277,7 +277,7 @@ namespace printnotes { + } +=20 + gnote::DepthNoteTag::Ptr depth =3D get_buffer()->find_depth_tag(p_s= tart); +- if(depth !=3D 0) { ++ if(depth) { + indentation +=3D ((int) (dpiX / 3)) * depth->get_depth(); + } + layout->set_width(pango_units_from_double((int)context->get_width()= - Property changes on: deskutils/gnote/files/patch-src_addins_printnotes_pr= intnotesnoteaddin.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: deskutils/gnote/files/patch-src_addins_statistics_statisticsapplic= ationaddin.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/gnote/files/patch-src_addins_statistics_statisticsapplicati= onaddin.cpp (nonexistent) +++ deskutils/gnote/files/patch-src_addins_statistics_statisticsapplicati= onaddin.cpp (working copy) @@ -0,0 +1,11 @@ +--- src/addins/statistics/statisticsapplicationaddin.cpp.orig 2015-11-28= 15:44:34 UTC ++++ src/addins/statistics/statisticsapplicationaddin.cpp +@@ -44,7 +44,7 @@ void StatisticsApplicationAddin::initial + { + if(!m_initialized) { + m_initialized =3D true; +- if(m_action =3D=3D 0) { ++ if(!m_action) { + m_action =3D Gtk::Action::create(); + m_action->set_name("ShowStatistics"); + m_action->set_label(_("Show Statistics")); Property changes on: deskutils/gnote/files/patch-src_addins_statistics_st= atisticsapplicationaddin.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: deskutils/gnote/files/patch-src_addins_todo_todonoteaddin.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/gnote/files/patch-src_addins_todo_todonoteaddin.cpp (nonexi= stent) +++ deskutils/gnote/files/patch-src_addins_todo_todonoteaddin.cpp (workin= g copy) @@ -0,0 +1,11 @@ +--- src/addins/todo/todonoteaddin.cpp.orig 2015-11-28 15:44:34 UTC ++++ src/addins/todo/todonoteaddin.cpp +@@ -42,7 +42,7 @@ TodoModule::TodoModule() + void Todo::initialize() + { + FOREACH(const std::string & s, s_todo_patterns) { +- if(get_note()->get_tag_table()->lookup(s) =3D=3D 0) { ++ if(!get_note()->get_tag_table()->lookup(s)) { + Glib::RefPtr<Gtk::TextTag> tag =3D Gtk::TextTag::create(s); + tag->property_foreground() =3D "#0080f0"; + tag->property_weight() =3D PANGO_WEIGHT_BOLD; Property changes on: deskutils/gnote/files/patch-src_addins_todo_todonote= addin.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: deskutils/gnote/files/patch-src_dbus_searchprovider.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/gnote/files/patch-src_dbus_searchprovider.cpp (nonexistent)= +++ deskutils/gnote/files/patch-src_dbus_searchprovider.cpp (working copy= ) @@ -0,0 +1,11 @@ +--- src/dbus/searchprovider.cpp.orig 2015-11-28 15:44:34 UTC ++++ src/dbus/searchprovider.cpp +@@ -228,7 +228,7 @@ Glib::VariantContainerBase SearchProvide +=20 + gchar *SearchProvider::get_icon() + { +- if(m_note_icon =3D=3D 0) { ++ if(!m_note_icon) { + Gtk::IconInfo info =3D gnote::IconManager::obj().lookup_icon(gnote:= :IconManager::NOTE, 48); + m_note_icon =3D Gio::Icon::create(info.get_filename()); + } Property changes on: deskutils/gnote/files/patch-src_dbus_searchprovider.= cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: deskutils/gnote/files/patch-src_gnome-keyring_ring.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/gnote/files/patch-src_gnome-keyring_ring.cpp (revision 4377= 43) +++ deskutils/gnote/files/patch-src_gnome-keyring_ring.cpp (nonexistent) @@ -1,10 +0,0 @@ ---- src/gnome_keyring/ring.cpp.orig 2013-10-30 16:54:52.000000000 +0100 -+++ src/gnome_keyring/ring.cpp 2013-10-30 16:56:09.000000000 +0100 -@@ -20,6 +20,7 @@ -=20 -=20 - #include <cstring> -+#include <cstdlib> -=20 - #include "keyringexception.hpp" - #include "ring.hpp" Property changes on: deskutils/gnote/files/patch-src_gnome-keyring_ring.c= pp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: deskutils/gnote/files/patch-src_gnome__keyring_ring.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/gnote/files/patch-src_gnome__keyring_ring.cpp (revision 437= 743) +++ deskutils/gnote/files/patch-src_gnome__keyring_ring.cpp (working copy= ) @@ -1,5 +1,5 @@ ---- src/gnome_keyring/ring.cpp.orig 2013-10-30 16:54:52.000000000 +0100 -+++ src/gnome_keyring/ring.cpp 2013-10-30 16:56:09.000000000 +0100 +--- src/gnome_keyring/ring.cpp.orig 2015-11-28 15:44:34 UTC ++++ src/gnome_keyring/ring.cpp @@ -20,6 +20,7 @@ =20 =20 Index: deskutils/gnote/files/patch-src_note.hpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/gnote/files/patch-src_note.hpp (nonexistent) +++ deskutils/gnote/files/patch-src_note.hpp (working copy) @@ -0,0 +1,20 @@ +--- src/note.hpp.orig 2015-11-28 15:44:34 UTC ++++ src/note.hpp +@@ -124,7 +124,7 @@ public: + const Glib::RefPtr<NoteTagTable> & get_tag_table(); + bool has_buffer() const + { +- return m_buffer; ++ return (bool)m_buffer; + } + const Glib::RefPtr<NoteBuffer> & get_buffer(); + bool has_window() const=20 +@@ -139,7 +139,7 @@ public: + bool is_special() const; + bool is_loaded() const + { +- return (m_buffer); ++ return (bool)m_buffer; + } + bool is_opened() const + {=20 Property changes on: deskutils/gnote/files/patch-src_note.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: deskutils/gnote/files/patch-src_notebuffer.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/gnote/files/patch-src_notebuffer.cpp (nonexistent) +++ deskutils/gnote/files/patch-src_notebuffer.cpp (working copy) @@ -0,0 +1,29 @@ +--- src/notebuffer.cpp.orig 2015-11-28 15:44:34 UTC ++++ src/notebuffer.cpp +@@ -248,7 +248,7 @@ namespace gnote { +=20 + Glib::RefPtr<Gtk::TextTag> depth =3D find_depth_tag(iter); +=20 +- return depth; ++ return (bool)depth; + } +=20 +=20 +@@ -1341,7 +1341,7 @@ namespace gnote { + if (iter.get_line() < buffer->get_line_count() - 1) { + Gtk::TextIter next_line =3D buffer->get_iter_at_line(iter.get_l= ine()+1); + next_line_has_depth =3D +- NoteBuffer::Ptr::cast_static(buffer)->find_depth_tag (next_li= ne); ++ (bool)NoteBuffer::Ptr::cast_static(buffer)->find_depth_tag (n= ext_line); + } +=20 + bool at_empty_line =3D iter.ends_line () && iter.starts_line (); +@@ -1576,7 +1576,7 @@ namespace gnote { + NoteBuffer::Ptr note_buffer =3D NoteBuffer::Ptr::cast_dyn= amic(buffer); + // Do not insert bullet if it's already there + // this happens when using double identation in bullet li= st +- if(note_buffer->find_depth_tag(apply_start) =3D=3D 0) { ++ if(!note_buffer->find_depth_tag(apply_start)) { + note_buffer->insert_bullet (apply_start, depth_tag->get= _depth(), depth_tag->get_direction()); + buffer->remove_all_tags (apply_start, apply_start); + offset +=3D 2; Property changes on: deskutils/gnote/files/patch-src_notebuffer.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: deskutils/gnote/files/patch-src_notetag.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/gnote/files/patch-src_notetag.cpp (nonexistent) +++ deskutils/gnote/files/patch-src_notetag.cpp (working copy) @@ -0,0 +1,11 @@ +--- src/notetag.cpp.orig 2015-11-28 15:44:34 UTC ++++ src/notetag.cpp +@@ -523,7 +523,7 @@ namespace gnote { +=20 + bool NoteTagTable::tag_has_depth(const Glib::RefPtr<Gtk::TextBuffer::= Tag> & tag) + { +- return DepthNoteTag::Ptr::cast_dynamic(tag); ++ return (bool)DepthNoteTag::Ptr::cast_dynamic(tag); + } +=20 +=20 Property changes on: deskutils/gnote/files/patch-src_notetag.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: deskutils/gnote/files/patch-src_notewindow.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/gnote/files/patch-src_notewindow.cpp (nonexistent) +++ deskutils/gnote/files/patch-src_notewindow.cpp (working copy) @@ -0,0 +1,29 @@ +--- src/notewindow.cpp.orig 2015-11-28 15:44:34 UTC ++++ src/notewindow.cpp +@@ -186,7 +186,7 @@ namespace gnote { + return; + } + remove_accel_group(*parent); +- if(parent->get_window() !=3D 0 ++ if(parent->get_window() + && (parent->get_window()->get_state() & Gdk::WINDOW_STATE_MAXIMI= ZED) =3D=3D 0) { + int cur_width, cur_height; + parent->get_size(cur_width, cur_height); +@@ -316,7 +316,7 @@ namespace gnote { + } + m_widget_actions[order] =3D action; + m_signal_actions_changed(); +- if(Glib::RefPtr<NonModifyingNoteAction>::cast_dynamic(action) =3D=3D= 0) { ++ if(!Glib::RefPtr<NonModifyingNoteAction>::cast_dynamic(action)) { + action->set_sensitive(m_enabled); + } + } +@@ -619,7 +619,7 @@ namespace gnote { + m_global_keys->enabled(m_enabled); + FOREACH(const Glib::RefPtr<Gtk::Action> & action, get_widget_action= s()) { + // A list includes empty actions to mark separators, non-modifyin= g actions are always enabled +- if(action !=3D 0 && Glib::RefPtr<NonModifyingNoteAction>::cast_dy= namic(action) =3D=3D 0) { ++ if(action && !Glib::RefPtr<NonModifyingNoteAction>::cast_dynamic(= action)) { + action->set_sensitive(enable); + } + } Property changes on: deskutils/gnote/files/patch-src_notewindow.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: deskutils/gnote/files/patch-src_remotecontrolproxy.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/gnote/files/patch-src_remotecontrolproxy.cpp (nonexistent) +++ deskutils/gnote/files/patch-src_remotecontrolproxy.cpp (working copy)= @@ -0,0 +1,11 @@ +--- src/remotecontrolproxy.cpp.orig 2015-11-28 15:44:34 UTC ++++ src/remotecontrolproxy.cpp +@@ -35,7 +35,7 @@ namespace { + void load_interface_from_file(const char *filename, const char *inter= face_name, + Glib::RefPtr<Gio::DBus::InterfaceInfo> = & interface) + { +- if(interface !=3D 0) { ++ if(interface) { + return; + } + std::ifstream fin(filename); Property changes on: deskutils/gnote/files/patch-src_remotecontrolproxy.c= pp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: deskutils/gnote/files/patch-src_searchnoteswidget.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/gnote/files/patch-src_searchnoteswidget.cpp (nonexistent) +++ deskutils/gnote/files/patch-src_searchnoteswidget.cpp (working copy) @@ -0,0 +1,11 @@ +--- src/searchnoteswidget.cpp.orig 2015-11-28 15:44:34 UTC ++++ src/searchnoteswidget.cpp +@@ -1520,7 +1520,7 @@ void SearchNotesWidget::parse_sorting_se + void SearchNotesWidget::on_rename_notebook() + { + Glib::RefPtr<Gtk::TreeSelection> selection =3D m_notebooksTree->get_s= election(); +- if(selection =3D=3D 0) { ++ if(!selection) { + return; + } + std::vector<Gtk::TreeModel::Path> selected_row =3D selection->get_sel= ected_rows(); Property changes on: deskutils/gnote/files/patch-src_searchnoteswidget.cp= p ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: deskutils/gnote/files/patch-src_synchronization_gnotesyncclient.cp= p =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- deskutils/gnote/files/patch-src_synchronization_gnotesyncclient.cpp (= nonexistent) +++ deskutils/gnote/files/patch-src_synchronization_gnotesyncclient.cpp (= working copy) @@ -0,0 +1,11 @@ +--- src/synchronization/gnotesyncclient.cpp.orig 2015-11-28 15:44:34 UTC= ++++ src/synchronization/gnotesyncclient.cpp +@@ -54,7 +54,7 @@ namespace sync { + { + m_local_manifest_file_path =3D Glib::build_filename(IGnote::conf_di= r(), LOCAL_MANIFEST_FILE_NAME); + Glib::RefPtr<Gio::File> manifest =3D Gio::File::create_for_path(m_l= ocal_manifest_file_path); +- if(manifest !=3D 0) { ++ if(manifest) { + m_file_watcher =3D manifest->monitor_file(); + m_file_watcher->signal_changed() + .connect(sigc::mem_fun(*this, &GnoteSyncClient::on_changed)); Property changes on: deskutils/gnote/files/patch-src_synchronization_gnot= esyncclient.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property --------------7EB28BCCD6C1B93C3506CE5E-- --alOLjArbwqMtmrPr8FHICiS2jHiKok76J-- --EcdQCEnuQokDFGCg5U4uUpIhlJkeQtNlm Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEl1bqgKaRyqfWXu/CfJ+WJvzb8UYFAljj8u4ACgkQfJ+WJvzb 8Uajkgf/fO2iIXVSvImN/0eASj95wZkkIDdul5WRI820nGOsnCqniDGjcHU1/3Ao 2vqTl+yWrb2/gBxHCjx80ftYIeYDqaArNzN5KERq+hRQ5D9cNzOstHChATdTZKZk X/jCyg6QO4pTh61KdNZNBA4BekUpLXMsM7sZQnfmpgGYyzTQ6+9GsCeaYaqCvIRh 2bVlQ1hJM2bqJ7LRvjaUDFfh9snXvzH/8LB/iNebWMBbtG8JzeXBHCjW52+TNxpU r16003qdJCjsST89Wq4yL/NTpouGAymFwnBL5HDU8UWx/r1bVRBWGDkq8Ke4sW6t BfF6+ZhLZn7chXJcWIzWP4hZvlOnFg== =SjXv -----END PGP SIGNATURE----- --EcdQCEnuQokDFGCg5U4uUpIhlJkeQtNlm--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8bfb3e1c-54e4-0511-9cb2-8a54e16b8266>