diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2007-09-28 22:54:42 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-09-28 22:54:42 +0800 |
| commit | caedac5aea69b34dd415ba391a6b53d830639aae (patch) | |
| tree | c5f981db3b1df6d7f11e10b1d046720801d28470 /libempathy | |
| parent | 3ed8bfb502719f5c0a3db522d652658cf2474c3a (diff) | |
| download | gsoc2013-empathy-caedac5aea69b34dd415ba391a6b53d830639aae.tar gsoc2013-empathy-caedac5aea69b34dd415ba391a6b53d830639aae.tar.gz gsoc2013-empathy-caedac5aea69b34dd415ba391a6b53d830639aae.tar.bz2 gsoc2013-empathy-caedac5aea69b34dd415ba391a6b53d830639aae.tar.lz gsoc2013-empathy-caedac5aea69b34dd415ba391a6b53d830639aae.tar.xz gsoc2013-empathy-caedac5aea69b34dd415ba391a6b53d830639aae.tar.zst gsoc2013-empathy-caedac5aea69b34dd415ba391a6b53d830639aae.zip | |
Ported from VOIP branch.
2007-09-28 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/empathy-contact-list-view.c:
* libempathy-gtk/empathy-chat-window.c:
* src/Makefile.am:
* libempathy/empathy-tp-group.c:
* libempathy/Makefile.am: Ported from VOIP branch.
svn path=/trunk/; revision=335
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/Makefile.am | 12 | ||||
| -rw-r--r-- | libempathy/empathy-tp-group.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 639d22ecb..9dc4021e2 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -78,21 +78,21 @@ libempathy_include_HEADERS = \ $(libempathy_headers) \ empathy-enum-types.h -%-marshal.h: %-marshal.list Makefile.am +%-marshal.h: %-marshal.list Makefile $(GLIB_GENMARSHAL) --header --prefix=$(subst -,_,$*)_marshal $< > $*-marshal.h -%-marshal.c: %-marshal.list Makefile.am +%-marshal.c: %-marshal.list Makefile echo "#include \"empathy-marshal.h\"" > $@ && \ $(GLIB_GENMARSHAL) --body --prefix=$(subst -,_,$*)_marshal $< >> $*-marshal.c -empathy-chandler-glue.h: empathy-chandler.xml +empathy-chandler-glue.h: empathy-chandler.xml Makefile $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=empathy_chandler --mode=glib-server --output=$@ $< -empathy-filter-glue.h: empathy-filter.xml +empathy-filter-glue.h: empathy-filter.xml Makefile $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=empathy_filter --mode=glib-server --output=$@ $< empathy-enum-types.h: stamp-empathy-enum-types.h @true -stamp-empathy-enum-types.h: Makefile $(libempathy_headers) +stamp-empathy-enum-types.h: $(libempathy_headers) Makefile (cd $(srcdir) \ && glib-mkenums \ --fhead "#ifndef __LIBEMPATHY_ENUM_TYPES_H__\n" \ @@ -109,7 +109,7 @@ stamp-empathy-enum-types.h: Makefile $(libempathy_headers) && rm -f xgen-gth \ && echo timestamp > $(@F) -empathy-enum-types.c: Makefile $(libempathy_headers) +empathy-enum-types.c: $(libempathy_headers) Makefile (cd $(srcdir) \ && glib-mkenums \ --fhead "#include <config.h>\n" \ diff --git a/libempathy/empathy-tp-group.c b/libempathy/empathy-tp-group.c index c4f7583e9..dbc2d228e 100644 --- a/libempathy/empathy-tp-group.c +++ b/libempathy/empathy-tp-group.c @@ -777,7 +777,7 @@ empathy_tp_group_get_name (EmpathyTpGroup *group) priv = GET_PRIV (group); /* Lazy initialisation */ - if (!priv->group_name) { + if (!priv->group_name && priv->tp_chan->handle != 0) { priv->group_name = empathy_inspect_channel (priv->account, priv->tp_chan); } |