Hi Dan,
I did not see it in the tree.
Here is the updated patch without line wrapp.
Thanks,
---
libmm-glib/mm-manager.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libmm-glib/mm-manager.c b/libmm-glib/mm-manager.c
index 46dd8ce..efea9b0 100644
--- a/libmm-glib/mm-manager.c
+++ b/libmm-glib/mm-manager.c
@@ -93,7 +93,7 @@ ensure_modem_manager1_proxy (MMManager *self,
{
gchar *name = NULL;
gchar *object_path = NULL;
- GDBusObjectManagerClientFlags flags =
G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE;
+ GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_NONE;
GDBusConnection *connection = NULL;
if (self->priv->manager_iface_proxy)
--
1.8.2.1
On Mon, Apr 29, 2013 at 9:55 AM, Dan Williams <[email protected]> wrote:
> On Mon, 2013-04-29 at 09:35 -0700, Yunlian Jiang wrote:
> > ---
> > libmm-glib/mm-manager.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Unfortunately this one doesn't work either, because your email client
> line-wrapped it, so we get:
>
> Applying: mm-glib: use correct enum type
> fatal: corrupt patch at line 14
> Patch failed at 0001 mm-glib: use correct enum type
>
> I've fixed that up and pushed it but a one-step apply with out errors
> works better :)
>
> Thanks!
> Dan
>
> > diff --git a/libmm-glib/mm-manager.c b/libmm-glib/mm-manager.c
> > index 46dd8ce..efea9b0 100644
> > --- a/libmm-glib/mm-manager.c
> > +++ b/libmm-glib/mm-manager.c
> > @@ -93,7 +93,7 @@ ensure_modem_manager1_proxy (MMManager *self,
> > {
> > gchar *name = NULL;
> > gchar *object_path = NULL;
> > - GDBusObjectManagerClientFlags flags =
> > G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE;
> > + GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_NONE;
> > GDBusConnection *connection = NULL;
> >
> > if (self->priv->manager_iface_proxy)
> > --
> > 1.8.2.1
> >
> >
> > On Mon, Apr 29, 2013 at 9:34 AM, Yunlian Jiang <[email protected]>
> wrote:
> >
> > > Please try this one from git format-patch
> > > Thanks
> > >
> > > ---
> > > libmm-glib/mm-manager.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/libmm-glib/mm-manager.c b/libmm-glib/mm-manager.c
> > > index 46dd8ce..efea9b0 100644
> > > --- a/libmm-glib/mm-manager.c
> > > +++ b/libmm-glib/mm-manager.c
> > > @@ -93,7 +93,7 @@ ensure_modem_manager1_proxy (MMManager *self,
> > > {
> > > gchar *name = NULL;
> > > gchar *object_path = NULL;
> > > - GDBusObjectManagerClientFlags flags =
> > > G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE;
> > > + GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_NONE;
> > > GDBusConnection *connection = NULL;
> > >
> > > if (self->priv->manager_iface_proxy)
> > > --
> > > 1.8.2.1
> > >
> > >
> > >
> > > On Sun, Apr 28, 2013 at 11:02 PM, Aleksander Morgado <
> > > [email protected]> wrote:
> > >
> > >> On 27/04/13 07:21, Yunlian Jiang wrote:
> > >> > This patch fixes mismatched enum type for a function parameter,
> which
> > >> > fixes the following clang warning:
> > >>
> > >> Patch doesn't seem to be cleanly applicable with "git am". How did you
> > >> create it? Please use either git send-email or git format-patch.
> > >>
> > >> >
> > >> > mm-manager.c:112:65: error: implicit conversion from enumeration
> type
> > >> >
> > >> > 'GDBusObjectManagerClientFlags' to different enumeration type
> > >> 'GDBusProxyFlags'
> > >> > [-Werror,-Wenum-conversion]
> > >> >
> flags,
> > >> >
> ^~~~~
> > >> > 1 error generated.
> > >> >
> > >> > Bug reported on
> > >> https://code.google.com/p/chromium/issues/detail?id=235989
> > >> >
> > >> >
> > >> > diff --git a/libmm-glib/mm-manager.c b/libmm-glib/mm-manager.c
> > >> > index 46dd8ce..efea9b0 100644
> > >> > --- a/libmm-glib/mm-manager.c
> > >> > +++ b/libmm-glib/mm-manager.c
> > >> > @@ -93,7 +93,7 @@ ensure_modem_manager1_proxy (MMManager *self,
> > >> > {
> > >> > gchar *name = NULL;
> > >> > gchar *object_path = NULL;
> > >> > - GDBusObjectManagerClientFlags flags =
> > >> G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE;
> > >> > + GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_NONE;
> > >> > GDBusConnection *connection = NULL;
> > >> >
> > >> > if (self->priv->manager_iface_proxy)
> > >> >
> > >> > --
> > >> >
> > >> > 1.8.2.1
> > >> >
> > >> >
> > >> >
> > >> > _______________________________________________
> > >> > networkmanager-list mailing list
> > >> > [email protected]
> > >> > https://mail.gnome.org/mailman/listinfo/networkmanager-list
> > >> >
> > >>
> > >>
> > >> --
> > >> Aleksander
> > >>
> > >
> > >
> > _______________________________________________
> > networkmanager-list mailing list
> > [email protected]
> > https://mail.gnome.org/mailman/listinfo/networkmanager-list
>
>
>
_______________________________________________
networkmanager-list mailing list
[email protected]
https://mail.gnome.org/mailman/listinfo/networkmanager-list
