diff options
author | Xavier Claessens <xclaesse@gmail.com> | 2007-09-21 19:11:35 +0800 |
---|---|---|
committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-09-21 19:11:35 +0800 |
commit | 004e5e331b89484f2448ab81d0e97cfc3b47af18 (patch) | |
tree | 4eea8d5349942d490b4ef9fac9c6c62d91177a20 /megaphone/data | |
parent | 1382956b87b5114aa35f4357d7edcf9d5507a2c0 (diff) | |
download | gsoc2013-empathy-004e5e331b89484f2448ab81d0e97cfc3b47af18.tar gsoc2013-empathy-004e5e331b89484f2448ab81d0e97cfc3b47af18.tar.gz gsoc2013-empathy-004e5e331b89484f2448ab81d0e97cfc3b47af18.tar.bz2 gsoc2013-empathy-004e5e331b89484f2448ab81d0e97cfc3b47af18.tar.lz gsoc2013-empathy-004e5e331b89484f2448ab81d0e97cfc3b47af18.tar.xz gsoc2013-empathy-004e5e331b89484f2448ab81d0e97cfc3b47af18.tar.zst gsoc2013-empathy-004e5e331b89484f2448ab81d0e97cfc3b47af18.zip |
Fix ref count error for account objects.
2007-09-21 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/empathy-contact-list-view.c: Fix ref count error for
account objects.
* libempathy/empathy-contact-manager.c: Disconnect signals from
MissionControl object when finalising the contact manager.
* configure.ac:
* megaphone/src/megaphone-applet.c:
* megaphone/src/Makefile.am:
* megaphone/src/megaphone-applet.h:
* megaphone/data/GNOME_Megaphone_Applet.schemas.in:
* megaphone/data/Makefile.am:
* megaphone/data/GNOME_Megaphone_Applet.server.in.in:
* megaphone/data/GNOME_Megaphone_Applet.xml:
* megaphone/Makefile.am:
* nothere/src/nothere-applet.c:
* nothere/src/Makefile.am:
* nothere/src/nothere-applet.h:
* nothere/data/Makefile.am:
* nothere/data/GNOME_NotHere_Applet.server.in.in:
* nothere/data/GNOME_NotHere_Applet.xml:
* nothere/Makefile.am:
* Makefile.am:
* po/POTFILES.in:
* po/POTFILES.skip: Add Megaphone and Nothere applets. Fixes bug
#464954 (Raphael Slinckx, Xavier Claessens).
svn path=/trunk/; revision=303
Diffstat (limited to 'megaphone/data')
-rw-r--r-- | megaphone/data/GNOME_Megaphone_Applet.schemas.in | 20 | ||||
-rw-r--r-- | megaphone/data/GNOME_Megaphone_Applet.server.in.in | 25 | ||||
-rw-r--r-- | megaphone/data/GNOME_Megaphone_Applet.xml | 9 | ||||
-rw-r--r-- | megaphone/data/Makefile.am | 35 |
4 files changed, 89 insertions, 0 deletions
diff --git a/megaphone/data/GNOME_Megaphone_Applet.schemas.in b/megaphone/data/GNOME_Megaphone_Applet.schemas.in new file mode 100644 index 000000000..bf6822d4d --- /dev/null +++ b/megaphone/data/GNOME_Megaphone_Applet.schemas.in @@ -0,0 +1,20 @@ +<gconfschemafile> + <schemalist> + + <schema> + <key>/schemas/apps/megaphone-applet/prefs/contact_id</key> + <applyto>/apps/megaphone-applet/prefs/contact_id</applyto> + <owner>megaphone</owner> + <type>string</type> + <default></default> + <locale name="C"> + <short>The contact to display in the applet. Empty means no contact is displayed.</short> + </locale> + </schema> + + </schemalist> +</gconfschemafile> + + + + diff --git a/megaphone/data/GNOME_Megaphone_Applet.server.in.in b/megaphone/data/GNOME_Megaphone_Applet.server.in.in new file mode 100644 index 000000000..2d1c3ac12 --- /dev/null +++ b/megaphone/data/GNOME_Megaphone_Applet.server.in.in @@ -0,0 +1,25 @@ +<oaf_info> + +<oaf_server iid="OAFIID:GNOME_Megaphone_Applet_Factory" type="exe" location="@LIBEXECDIR@/megaphone-applet"> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:Bonobo/GenericFactory:1.0"/> + <item value="IDL:Bonobo/Unknown:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Megaphone"/> + <oaf_attribute name="description" type="string" _value="Talk!"/> +</oaf_server> + +<oaf_server iid="OAFIID:GNOME_Megaphone_Applet" type="factory" location="OAFIID:GNOME_Megaphone_Applet_Factory"> + + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/> + <item value="IDL:Bonobo/Control:1.0"/> + <item value="IDL:Bonobo/Unknown:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Megaphone"/> + <oaf_attribute name="description" type="string" _value="Talk!"/> + <oaf_attribute name="panel:category" type="string" value="Internet"/> + <oaf_attribute name="panel:icon" type="string" value="empathy.png"/> +</oaf_server> + +</oaf_info> diff --git a/megaphone/data/GNOME_Megaphone_Applet.xml b/megaphone/data/GNOME_Megaphone_Applet.xml new file mode 100644 index 000000000..8a139707a --- /dev/null +++ b/megaphone/data/GNOME_Megaphone_Applet.xml @@ -0,0 +1,9 @@ +<Root> + <popups> + <popup name="button3"> + <menuitem name="Information" verb="information" _label="_Information" pixtype="stock" pixname="gtk-info"/> + <menuitem name="Preferences" verb="preferences" _label="_Preferences" pixtype="stock" pixname="gtk-properties"/> + <menuitem name="About" verb="about" _label="_About" pixtype="stock" pixname="gtk-about"/> + </popup> + </popups> +</Root> diff --git a/megaphone/data/Makefile.am b/megaphone/data/Makefile.am new file mode 100644 index 000000000..3dbde679f --- /dev/null +++ b/megaphone/data/Makefile.am @@ -0,0 +1,35 @@ +# Panel applet bonobo stuff +serverdir = $(libdir)/bonobo/servers +server_in_files = GNOME_Megaphone_Applet.server.in +server_DATA = $(server_in_files:.server.in=.server) + + +# GConf Schemas +schemadir = $(GCONF_SCHEMA_FILE_DIR) +schema_in_files = GNOME_Megaphone_Applet.schemas.in +schema_DATA = $(schema_in_files:.schemas.in=.schemas) + +# Misc data +resourcesdir = $(pkgdatadir) +resources_DATA = \ + GNOME_Megaphone_Applet.xml +# megaphone-applet.glade + +megaphonebindir = $(libexecdir) + +# Build rules +@INTLTOOL_SERVER_RULE@ +@INTLTOOL_SCHEMAS_RULE@ + +$(server_in_files): $(server_in_files:.server.in=.server.in.in) + sed -e "s|\@LIBEXECDIR\@|$(megaphonebindir)|" $< > $@ + +DISTCLEANFILES = \ + $(server_DATA) \ + $(server_in_files) \ + $(schema_DATA) + +EXTRA_DIST = \ + GNOME_Megaphone_Applet.server.in.in \ + $(resources_DATA) \ + $(schema_in_files) |