nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Build with Vala 0.17.2: Closes #5452

Browse source 
Two problems: binding changes in Gtk.TreeStore.remove() and it
appears that Vala is now using the type_id field in the VAPIs
(before it seemed not to be used anywhere).
This commit is contained in:
Jim Nelson 2012-06-25 11:58:27 -07:00
parent 146965fc3f
commit 858c5db49c
5 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -9,4 +9,4 @@ build/
/geary-console
*.xz
*.swp
vapi/gmime-2.6/gmime-2.6.gi

2
src/client/ui/message-list-store.vala
View file

@ -119,7 +119,7 @@ public class MessageListStore : Gtk.TreeStore {
return;
}
remove(iter);
remove(ref iter);
}
public bool has_conversation(Geary.Conversation conversation) {

6
src/client/ui/sidebar/sidebar-tree.vala
View file

@ -533,7 +533,8 @@ public class Sidebar.Tree : Gtk.TreeView {
if (only_children)
return;
store.remove(wrapper.get_iter());
Gtk.TreeIter iter = wrapper.get_iter();
store.remove(ref iter);
if (selected_wrapper == wrapper)
selected_wrapper = null;
@ -619,7 +620,8 @@ public class Sidebar.Tree : Gtk.TreeView {
bool selected = (get_current_path().compare(wrapper.get_path()) == 0);
// remove from current position in tree
store.remove(wrapper.get_iter());
Gtk.TreeIter iter = wrapper.get_iter();
store.remove(ref iter);
Sidebar.Entry? parent = branch.get_parent(entry);
assert(parent != null);

8
vapi/gmime-2.6.vapi
View file

@ -1382,7 +1382,7 @@ namespace GMime {
[CCode (cheader_filename = "gmime/gmime.h", cname = "g_mime_yencode_step")]
public static size_t yencode_step (uint inbuf, size_t inlen, uint outbuf, int state, uint32 pcrc, uint32 crc);
}
[CCode (cheader_filename = "gmime/gmime.h", cname = "InternetAddress", type_check_function = "IS_INTERNET_ADDRESS", type_id = "INTERNET_ADDRESS")]
[CCode (cheader_filename = "gmime/gmime.h", cname = "InternetAddress", type_check_function = "IS_INTERNET_ADDRESS", type_id = "INTERNET_ADDRESS_TYPE")]
public class InternetAddress : GLib.Object {
[CCode (cname = "internet_address_get_name")]
public unowned string? get_name ();
@ -1391,7 +1391,7 @@ public class InternetAddress : GLib.Object {
[CCode (cname = "internet_address_to_string")]
public virtual string to_string (bool encoded);
}
[CCode (cheader_filename = "gmime/gmime.h", cname = "InternetAddressGroup", type_check_function = "INTERNET_ADDRESS_IS_GROUP", type_id = "INTERNET_ADDRESS_GROUP")]
[CCode (cheader_filename = "gmime/gmime.h", cname = "InternetAddressGroup", type_check_function = "INTERNET_ADDRESS_IS_GROUP", type_id = "INTERNET_ADDRESS_TYPE_GROUP")]
public class InternetAddressGroup : InternetAddress {
[CCode (cname = "internet_address_group_new")]
public InternetAddressGroup (string name);
@ -1402,7 +1402,7 @@ public class InternetAddressGroup : InternetAddress {
[CCode (cname = "internet_address_group_set_members")]
public void set_members (InternetAddressList members);
}
[CCode (cheader_filename = "gmime/gmime.h", cname = "InternetAddressMailbox", type_check_function = "INTERNET_ADDRESS_IS_MAILBOX", type_id = "INTERNET_ADDRESS_MAILBOX")]
[CCode (cheader_filename = "gmime/gmime.h", cname = "InternetAddressMailbox", type_check_function = "INTERNET_ADDRESS_IS_MAILBOX", type_id = "INTERNET_ADDRESS_TYPE_MAILBOX")]
public class InternetAddressMailbox : InternetAddress {
[CCode (cname = "internet_address_mailbox_new")]
public InternetAddressMailbox (string? name, string addr);
@ -1411,7 +1411,7 @@ public class InternetAddressMailbox : InternetAddress {
[CCode (cname = "internet_address_mailbox_set_addr")]
public void set_addr (string addr);
}
[CCode (cheader_filename = "gmime/gmime.h", cname = "InternetAddressList", type_check_function = "IS_INTERNET_ADDRESS_LIST", type_id = "INTERNET_ADDRESS_LIST")]
[CCode (cheader_filename = "gmime/gmime.h", cname = "InternetAddressList", type_check_function = "IS_INTERNET_ADDRESS_LIST", type_id = "INTERNET_ADDRESS_LIST_TYPE")]
public class InternetAddressList : GLib.Object {
[CCode (cname = "internet_address_list_new")]
public InternetAddressList ();

8
vapi/gmime-2.6/gmime-2.6-custom.vala
View file

@ -4,7 +4,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
[CCode (cname="InternetAddress", cheader_filename="gmime/gmime.h", type_id="INTERNET_ADDRESS", type_check_function="IS_INTERNET_ADDRESS")]
[CCode (cname="InternetAddress", cheader_filename="gmime/gmime.h", type_id="INTERNET_ADDRESS_TYPE", type_check_function="IS_INTERNET_ADDRESS")]
public class InternetAddress : GLib.Object {
[CCode (cname="internet_address_get_name")]
public unowned string? get_name();
@ -14,7 +14,7 @@ public class InternetAddress : GLib.Object {
public virtual string to_string(bool encoded);
}
[CCode (cname="InternetAddressGroup", cheader_filename="gmime/gmime.h", type_id="INTERNET_ADDRESS_GROUP", type_check_function="INTERNET_ADDRESS_IS_GROUP")]
[CCode (cname="InternetAddressGroup", cheader_filename="gmime/gmime.h", type_id="INTERNET_ADDRESS_TYPE_GROUP", type_check_function="INTERNET_ADDRESS_IS_GROUP")]
public class InternetAddressGroup : InternetAddress {
[CCode (cname="internet_address_group_new")]
public InternetAddressGroup(string name);
@ -26,7 +26,7 @@ public class InternetAddressGroup : InternetAddress {
public int add_member(InternetAddress member);
}
[CCode (cname="InternetAddressMailbox", cheader_filename="gmime/gmime.h", type_id="INTERNET_ADDRESS_MAILBOX", type_check_function="INTERNET_ADDRESS_IS_MAILBOX")]
[CCode (cname="InternetAddressMailbox", cheader_filename="gmime/gmime.h", type_id="INTERNET_ADDRESS_TYPE_MAILBOX", type_check_function="INTERNET_ADDRESS_IS_MAILBOX")]
public class InternetAddressMailbox : InternetAddress {
[CCode (cname="internet_address_mailbox_new")]
public InternetAddressMailbox(string? name, string addr);
@ -36,7 +36,7 @@ public class InternetAddressMailbox : InternetAddress {
public void set_addr(string addr);
}
[CCode (cname="InternetAddressList", cheader_filename="gmime/gmime.h", type_id="INTERNET_ADDRESS_LIST", type_check_function="IS_INTERNET_ADDRESS_LIST")]
[CCode (cname="InternetAddressList", cheader_filename="gmime/gmime.h", type_id="INTERNET_ADDRESS_LIST_TYPE", type_check_function="IS_INTERNET_ADDRESS_LIST")]
public class InternetAddressList : GLib.Object {
[CCode (cname="internet_address_list_new")]
public InternetAddressList();