Merge lp:~charlesk/libdbusmenu/compile-with-clang into lp:libdbusmenu/13.04

Proposed by Charles Kerr
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 431
Merged at revision: 433
Proposed branch: lp:~charlesk/libdbusmenu/compile-with-clang
Merge into: lp:libdbusmenu/13.04
Diff against target: 37 lines (+5/-5)
2 files modified
libdbusmenu-glib/menuitem.c (+2/-2)
libdbusmenu-glib/server.c (+3/-3)
To merge this branch: bzr merge lp:~charlesk/libdbusmenu/compile-with-clang
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Albert Astals Cid (community) Approve
Review via email: mp+131599@code.launchpad.net

Commit message

when initializing fields inside a struct being declared, replace gccism with c99 syntax

Description of the change

when initializing fields inside a struct being declared, replace gccism with c99 syntax

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

Works fine :-)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libdbusmenu-glib/menuitem.c'
--- libdbusmenu-glib/menuitem.c 2012-10-07 15:35:50 +0000
+++ libdbusmenu-glib/menuitem.c 2012-10-26 12:42:24 +0000
@@ -974,7 +974,7 @@
974 }974 }
975 return mi;975 return mi;
976 }976 }
977 find_id_t find_id = {mi: NULL, id: id};977 find_id_t find_id = {.mi=NULL, .id=id};
978 find_id_helper(mi, &find_id);978 find_id_helper(mi, &find_id);
979 return find_id.mi;979 return find_id.mi;
980}980}
@@ -1712,7 +1712,7 @@
17121712
1713 func(mi, data);1713 func(mi, data);
1714 GList * children = dbusmenu_menuitem_get_children(mi);1714 GList * children = dbusmenu_menuitem_get_children(mi);
1715 foreach_struct_t foreach_data = {func: func, data: data};1715 foreach_struct_t foreach_data = {.func=func, .data=data};
1716 g_list_foreach(children, foreach_helper, &foreach_data);1716 g_list_foreach(children, foreach_helper, &foreach_data);
1717 return;1717 return;
1718}1718}
17191719
=== modified file 'libdbusmenu-glib/server.c'
--- libdbusmenu-glib/server.c 2012-10-07 15:35:50 +0000
+++ libdbusmenu-glib/server.c 2012-10-26 12:42:24 +0000
@@ -215,9 +215,9 @@
215static GDBusNodeInfo * dbusmenu_node_info = NULL;215static GDBusNodeInfo * dbusmenu_node_info = NULL;
216static GDBusInterfaceInfo * dbusmenu_interface_info = NULL;216static GDBusInterfaceInfo * dbusmenu_interface_info = NULL;
217static const GDBusInterfaceVTable dbusmenu_interface_table = {217static const GDBusInterfaceVTable dbusmenu_interface_table = {
218 method_call: bus_method_call,218 .method_call = bus_method_call,
219 get_property: bus_get_prop,219 .get_property = bus_get_prop,
220 set_property: NULL /* No properties that can be set */220 .set_property = NULL /* No properties that can be set */
221};221};
222static method_table_t dbusmenu_method_table[METHOD_COUNT];222static method_table_t dbusmenu_method_table[METHOD_COUNT];
223223

Subscribers

People subscribed via source and target branches

to all changes: