Fri, 13 Mar 2020 22:57:27 +0000
Merged in default (pull request #673)
A few tweaks to severely limit the warnings that are spit out when libpurple is compiled
Approved-by: Richard Laager
Approved-by: Elliott Sales de Andrade
|
39887
9c8f874c74a0
Clean up all of the license headers
Gary Kramlich <grim@reaperworld.com>
parents:
39619
diff
changeset
|
1 | /* |
|
9c8f874c74a0
Clean up all of the license headers
Gary Kramlich <grim@reaperworld.com>
parents:
39619
diff
changeset
|
2 | * finch |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
3 | * |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
4 | * Finch is the legal property of its developers, whose names are too numerous |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
5 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
6 | * source distribution. |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
7 | * |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
8 | * This program is free software; you can redistribute it and/or modify |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
9 | * it under the terms of the GNU General Public License as published by |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
10 | * the Free Software Foundation; either version 2 of the License, or |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
11 | * (at your option) any later version. |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
12 | * |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
13 | * This program is distributed in the hope that it will be useful, |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
16 | * GNU General Public License for more details. |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
17 | * |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
18 | * You should have received a copy of the GNU General Public License |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
19 | * along with this program; if not, write to the Free Software |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
21 | */ |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
22 | |
|
29106
51c7b2177e42
Fix all the remaining files for which internal.h doesn't end up being the first include.
Paul Aurich <darkrain42@pidgin.im>
parents:
28278
diff
changeset
|
23 | #include <internal.h> |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
24 | #include "finch.h" |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
25 | #include "gntconv.h" |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
26 | #include "gntmedia.h" |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
27 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
28 | #include "gnt.h" |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
29 | #include "gntbutton.h" |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
30 | #include "gntbox.h" |
|
22683
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
31 | #include "gntlabel.h" |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
32 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
33 | #include "cmds.h" |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
34 | #include "conversation.h" |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
35 | #include "debug.h" |
|
26479
47511dae9f81
Move GStreamer related media functions into its own header.
Michael Ruprecht <maiku@pidgin.im>
parents:
26464
diff
changeset
|
36 | #include "mediamanager.h" |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
37 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
38 | /* An incredibly large part of the following is from gtkmedia.c */ |
|
23704
9b88c9b23aed
Use USE_VV instead of USE_FARSIGHT.
Michael Ruprecht <maiku@pidgin.im>
parents:
23700
diff
changeset
|
39 | #ifdef USE_VV |
|
26760
251146cb6d09
Fix build with --disable-gstreamer.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
26746
diff
changeset
|
40 | #include "media-gst.h" |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
41 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
42 | #undef hangup |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
43 | |
|
26505
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
44 | #define FINCH_TYPE_MEDIA (finch_media_get_type()) |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
45 | #define FINCH_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), FINCH_TYPE_MEDIA, FinchMedia)) |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
46 | #define FINCH_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), FINCH_TYPE_MEDIA, FinchMediaClass)) |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
47 | #define FINCH_IS_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), FINCH_TYPE_MEDIA)) |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
48 | #define FINCH_IS_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), FINCH_TYPE_MEDIA)) |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
49 | #define FINCH_MEDIA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), FINCH_TYPE_MEDIA, FinchMediaClass)) |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
50 | |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
51 | typedef struct _FinchMedia FinchMedia; |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
52 | typedef struct _FinchMediaClass FinchMediaClass; |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
53 | typedef struct _FinchMediaPrivate FinchMediaPrivate; |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
54 | typedef enum _FinchMediaState FinchMediaState; |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
55 | |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
56 | struct _FinchMediaClass |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
57 | { |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
58 | GntBoxClass parent_class; |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
59 | }; |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
60 | |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
61 | struct _FinchMedia |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
62 | { |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
63 | GntBox parent; |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
64 | FinchMediaPrivate *priv; |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
65 | }; |
|
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
66 | |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
67 | struct _FinchMediaPrivate |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
68 | { |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
69 | PurpleMedia *media; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
70 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
71 | GntWidget *accept; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
72 | GntWidget *reject; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
73 | GntWidget *hangup; |
|
22683
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
74 | GntWidget *calling; |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
75 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
76 | PurpleConversation *conv; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
77 | }; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
78 | |
|
39248
9541bd9eed1f
Port Finch away from deprecated g_type_class_add_private()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38027
diff
changeset
|
79 | static GType finch_media_get_type (void); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
80 | static void finch_media_class_init (FinchMediaClass *klass); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
81 | static void finch_media_init (FinchMedia *media); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
82 | static void finch_media_finalize (GObject *object); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
83 | static void finch_media_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
84 | static void finch_media_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
85 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
86 | enum { |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
87 | MESSAGE, |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
88 | LAST_SIGNAL |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
89 | }; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
90 | static guint finch_media_signals[LAST_SIGNAL] = {0}; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
91 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
92 | enum { |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
93 | PROP_0, |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
94 | PROP_MEDIA, |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
95 | }; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
96 | |
|
39248
9541bd9eed1f
Port Finch away from deprecated g_type_class_add_private()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38027
diff
changeset
|
97 | G_DEFINE_TYPE_WITH_PRIVATE(FinchMedia, finch_media, GNT_TYPE_BOX); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
98 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
99 | static void |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
100 | finch_media_class_init (FinchMediaClass *klass) |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
101 | { |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
102 | GObjectClass *gobject_class = (GObjectClass*)klass; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
103 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
104 | gobject_class->finalize = finch_media_finalize; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
105 | gobject_class->set_property = finch_media_set_property; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
106 | gobject_class->get_property = finch_media_get_property; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
107 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
108 | g_object_class_install_property(gobject_class, PROP_MEDIA, |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
109 | g_param_spec_object("media", |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
110 | "PurpleMedia", |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
111 | "The PurpleMedia associated with this media.", |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
112 | PURPLE_TYPE_MEDIA, |
|
35059
5fd94b14cc49
libgnt: Use G_PARAM_STATIC_STRINGS and ensure g_object_notify is always called
Ankit Vani <a@nevitus.org>
parents:
35001
diff
changeset
|
113 | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
114 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
115 | finch_media_signals[MESSAGE] = g_signal_new("message", G_TYPE_FROM_CLASS(klass), |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
116 | G_SIGNAL_RUN_LAST, 0, NULL, NULL, |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
117 | g_cclosure_marshal_VOID__STRING, |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
118 | G_TYPE_NONE, 1, G_TYPE_STRING); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
119 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
120 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
121 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
122 | static void |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
123 | finch_media_init (FinchMedia *media) |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
124 | { |
|
39248
9541bd9eed1f
Port Finch away from deprecated g_type_class_add_private()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38027
diff
changeset
|
125 | media->priv = finch_media_get_instance_private(media); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
126 | |
|
27933
9e7789d3a809
Fix two strings as pointed out on translators@
Paul Aurich <darkrain42@pidgin.im>
parents:
27883
diff
changeset
|
127 | media->priv->calling = gnt_label_new(_("Calling...")); |
|
22683
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
128 | media->priv->hangup = gnt_button_new(_("Hangup")); |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
129 | media->priv->accept = gnt_button_new(_("Accept")); |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
130 | media->priv->reject = gnt_button_new(_("Reject")); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
131 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
132 | gnt_box_set_alignment(GNT_BOX(media), GNT_ALIGN_MID); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
133 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
134 | gnt_box_add_widget(GNT_BOX(media), media->priv->accept); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
135 | gnt_box_add_widget(GNT_BOX(media), media->priv->reject); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
136 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
137 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
138 | static void |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
139 | finch_media_finalize (GObject *media) |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
140 | { |
|
26123
4948b40fdbec
Make voice calls work with Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26111
diff
changeset
|
141 | FinchMedia *gntmedia = FINCH_MEDIA(media); |
|
4948b40fdbec
Make voice calls work with Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26111
diff
changeset
|
142 | purple_debug_info("gntmedia", "finch_media_finalize\n"); |
|
4948b40fdbec
Make voice calls work with Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26111
diff
changeset
|
143 | if (gntmedia->priv->media) |
|
4948b40fdbec
Make voice calls work with Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26111
diff
changeset
|
144 | g_object_unref(gntmedia->priv->media); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
145 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
146 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
147 | static void |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
148 | finch_media_emit_message(FinchMedia *gntmedia, const char *msg) |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
149 | { |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
150 | g_signal_emit(gntmedia, finch_media_signals[MESSAGE], 0, msg); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
151 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
152 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
153 | static void |
|
26501
c186275f46aa
Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents:
26500
diff
changeset
|
154 | finch_media_connected_cb(PurpleMedia *media, FinchMedia *gntmedia) |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
155 | { |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
156 | GntWidget *parent; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
157 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
158 | finch_media_emit_message(gntmedia, _("Call in progress.")); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
159 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
160 | gnt_box_remove(GNT_BOX(gntmedia), gntmedia->priv->accept); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
161 | gnt_box_remove(GNT_BOX(gntmedia), gntmedia->priv->reject); |
|
22683
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
162 | gnt_box_remove(GNT_BOX(gntmedia), gntmedia->priv->hangup); |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
163 | gnt_box_remove(GNT_BOX(gntmedia), gntmedia->priv->calling); |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
164 | |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
165 | gnt_box_add_widget(GNT_BOX(gntmedia), gntmedia->priv->hangup); |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
166 | |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
167 | gnt_widget_destroy(gntmedia->priv->accept); |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
168 | gnt_widget_destroy(gntmedia->priv->reject); |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
169 | gnt_widget_destroy(gntmedia->priv->calling); |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
170 | gntmedia->priv->accept = NULL; |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
171 | gntmedia->priv->reject = NULL; |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
172 | gntmedia->priv->calling = NULL; |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
173 | |
|
39619
2451343ed79b
Use gnt_widget_get_toplevel everywhere.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39424
diff
changeset
|
174 | parent = gnt_widget_get_toplevel(GNT_WIDGET(gntmedia)); |
|
22683
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
175 | gnt_box_readjust(GNT_BOX(parent)); |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
176 | gnt_widget_draw(parent); |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
177 | } |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
178 | |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
179 | static void |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
180 | finch_media_wait_cb(PurpleMedia *media, FinchMedia *gntmedia) |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
181 | { |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
182 | GntWidget *parent; |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
183 | |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
184 | gnt_box_remove(GNT_BOX(gntmedia), gntmedia->priv->accept); |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
185 | gnt_box_remove(GNT_BOX(gntmedia), gntmedia->priv->reject); |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
186 | gnt_box_remove(GNT_BOX(gntmedia), gntmedia->priv->hangup); |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
187 | gnt_box_remove(GNT_BOX(gntmedia), gntmedia->priv->calling); |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
188 | |
|
bd514cc037cf
Fine tune the media (audio) widget in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22682
diff
changeset
|
189 | gnt_box_add_widget(GNT_BOX(gntmedia), gntmedia->priv->calling); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
190 | gnt_box_add_widget(GNT_BOX(gntmedia), gntmedia->priv->hangup); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
191 | |
|
39619
2451343ed79b
Use gnt_widget_get_toplevel everywhere.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39424
diff
changeset
|
192 | parent = gnt_widget_get_toplevel(GNT_WIDGET(gntmedia)); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
193 | gnt_box_readjust(GNT_BOX(parent)); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
194 | gnt_widget_draw(parent); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
195 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
196 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
197 | static void |
|
26449
9e381dc6ed24
Rename state-changed enum and values.
Michael Ruprecht <maiku@pidgin.im>
parents:
26445
diff
changeset
|
198 | finch_media_state_changed_cb(PurpleMedia *media, PurpleMediaState state, |
|
26244
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
199 | gchar *sid, gchar *name, FinchMedia *gntmedia) |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
200 | { |
|
26449
9e381dc6ed24
Rename state-changed enum and values.
Michael Ruprecht <maiku@pidgin.im>
parents:
26445
diff
changeset
|
201 | purple_debug_info("gntmedia", "state: %d sid: %s name: %s\n", |
|
9e381dc6ed24
Rename state-changed enum and values.
Michael Ruprecht <maiku@pidgin.im>
parents:
26445
diff
changeset
|
202 | state, sid, name); |
|
26244
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
203 | if (sid == NULL && name == NULL) { |
|
26449
9e381dc6ed24
Rename state-changed enum and values.
Michael Ruprecht <maiku@pidgin.im>
parents:
26445
diff
changeset
|
204 | if (state == PURPLE_MEDIA_STATE_END) { |
|
26244
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
205 | finch_media_emit_message(gntmedia, |
|
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
206 | _("The call has been terminated.")); |
|
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
207 | finch_conversation_set_info_widget( |
|
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
208 | gntmedia->priv->conv, NULL); |
|
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
209 | gnt_widget_destroy(GNT_WIDGET(gntmedia)); |
|
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
210 | /* |
|
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
211 | * XXX: This shouldn't have to be here |
|
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
212 | * to free the FinchMedia widget. |
|
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
213 | */ |
|
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
214 | g_object_unref(gntmedia); |
|
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
215 | } |
|
26449
9e381dc6ed24
Rename state-changed enum and values.
Michael Ruprecht <maiku@pidgin.im>
parents:
26445
diff
changeset
|
216 | } else if (state == PURPLE_MEDIA_STATE_CONNECTED) { |
|
26501
c186275f46aa
Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents:
26500
diff
changeset
|
217 | finch_media_connected_cb(media, gntmedia); |
|
26524
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
218 | } else if (state == PURPLE_MEDIA_STATE_NEW && |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
29106
diff
changeset
|
219 | sid != NULL && name != NULL && |
|
26524
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
220 | purple_media_is_initiator(media, sid, name) == FALSE) { |
|
26746
2a2d45ac9774
Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents:
26647
diff
changeset
|
221 | PurpleAccount *account; |
|
26524
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
222 | PurpleBuddy *buddy; |
|
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
223 | const gchar *alias; |
|
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
224 | PurpleMediaSessionType type = |
|
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
225 | purple_media_get_session_type(media, sid); |
|
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
226 | gchar *message = NULL; |
|
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
227 | |
|
26746
2a2d45ac9774
Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents:
26647
diff
changeset
|
228 | account = purple_media_get_account(gntmedia->priv->media); |
|
34728
8efd73063ecf
Renamed buddy list functions to more appropriate/simler names.
Ankit Vani <a@nevitus.org>
parents:
34657
diff
changeset
|
229 | buddy = purple_blist_find_buddy(account, name); |
|
26524
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
230 | alias = buddy ? purple_buddy_get_contact_alias(buddy) : name; |
|
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
231 | |
|
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
232 | if (type & PURPLE_MEDIA_AUDIO) { |
|
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
233 | message = g_strdup_printf( |
|
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
234 | _("%s wishes to start an audio session with you."), |
|
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
235 | alias); |
|
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
236 | } else { |
|
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
237 | message = g_strdup_printf( |
|
26647
89bcc7bce53e
Minor grammatical message fixes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26631
diff
changeset
|
238 | _("%s is trying to start an unsupported media session type with you."), |
|
26524
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
239 | alias); |
|
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
240 | } |
|
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
241 | finch_media_emit_message(gntmedia, message); |
|
265d852c96bb
Say which media type is being requested in Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26522
diff
changeset
|
242 | g_free(message); |
|
26244
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
243 | } |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
244 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
245 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
246 | static void |
|
26445
6da3853c89c2
Use stream-info instead of state-changed for reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26248
diff
changeset
|
247 | finch_media_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type, |
|
26496
11e1e5221460
Create purple_media_stream_info. Add local parameter to stream-info signal.
Michael Ruprecht <maiku@pidgin.im>
parents:
26495
diff
changeset
|
248 | gchar *sid, gchar *name, gboolean local, FinchMedia *gntmedia) |
|
26445
6da3853c89c2
Use stream-info instead of state-changed for reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26248
diff
changeset
|
249 | { |
|
6da3853c89c2
Use stream-info instead of state-changed for reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26248
diff
changeset
|
250 | if (type == PURPLE_MEDIA_INFO_REJECT) { |
|
6da3853c89c2
Use stream-info instead of state-changed for reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26248
diff
changeset
|
251 | finch_media_emit_message(gntmedia, |
|
6da3853c89c2
Use stream-info instead of state-changed for reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26248
diff
changeset
|
252 | _("You have rejected the call.")); |
|
6da3853c89c2
Use stream-info instead of state-changed for reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26248
diff
changeset
|
253 | } |
|
6da3853c89c2
Use stream-info instead of state-changed for reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26248
diff
changeset
|
254 | } |
|
6da3853c89c2
Use stream-info instead of state-changed for reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26248
diff
changeset
|
255 | |
|
6da3853c89c2
Use stream-info instead of state-changed for reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26248
diff
changeset
|
256 | static void |
|
26501
c186275f46aa
Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents:
26500
diff
changeset
|
257 | finch_media_accept_cb(PurpleMedia *media, GntWidget *widget) |
|
c186275f46aa
Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents:
26500
diff
changeset
|
258 | { |
|
c186275f46aa
Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents:
26500
diff
changeset
|
259 | purple_media_stream_info(media, PURPLE_MEDIA_INFO_ACCEPT, |
|
c186275f46aa
Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents:
26500
diff
changeset
|
260 | NULL, NULL, TRUE); |
|
c186275f46aa
Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents:
26500
diff
changeset
|
261 | } |
|
c186275f46aa
Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents:
26500
diff
changeset
|
262 | |
|
c186275f46aa
Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents:
26500
diff
changeset
|
263 | static void |
|
26499
759bf410db86
Remove purple_media_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents:
26496
diff
changeset
|
264 | finch_media_hangup_cb(PurpleMedia *media, GntWidget *widget) |
|
759bf410db86
Remove purple_media_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents:
26496
diff
changeset
|
265 | { |
|
759bf410db86
Remove purple_media_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents:
26496
diff
changeset
|
266 | purple_media_stream_info(media, PURPLE_MEDIA_INFO_HANGUP, |
|
759bf410db86
Remove purple_media_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents:
26496
diff
changeset
|
267 | NULL, NULL, TRUE); |
|
759bf410db86
Remove purple_media_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents:
26496
diff
changeset
|
268 | } |
|
759bf410db86
Remove purple_media_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents:
26496
diff
changeset
|
269 | |
|
759bf410db86
Remove purple_media_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents:
26496
diff
changeset
|
270 | static void |
|
26500
8fc1146ee03c
Remove purple_media_reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26499
diff
changeset
|
271 | finch_media_reject_cb(PurpleMedia *media, GntWidget *widget) |
|
8fc1146ee03c
Remove purple_media_reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26499
diff
changeset
|
272 | { |
|
8fc1146ee03c
Remove purple_media_reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26499
diff
changeset
|
273 | purple_media_stream_info(media, PURPLE_MEDIA_INFO_REJECT, |
|
8fc1146ee03c
Remove purple_media_reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26499
diff
changeset
|
274 | NULL, NULL, TRUE); |
|
8fc1146ee03c
Remove purple_media_reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26499
diff
changeset
|
275 | } |
|
8fc1146ee03c
Remove purple_media_reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26499
diff
changeset
|
276 | |
|
8fc1146ee03c
Remove purple_media_reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26499
diff
changeset
|
277 | static void |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
278 | finch_media_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
279 | { |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
280 | FinchMedia *media; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
281 | g_return_if_fail(FINCH_IS_MEDIA(object)); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
282 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
283 | media = FINCH_MEDIA(object); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
284 | switch (prop_id) { |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
285 | case PROP_MEDIA: |
|
26244
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
286 | { |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
287 | if (media->priv->media) |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
288 | g_object_unref(media->priv->media); |
|
39424
793f7d43e2f0
Use g_value_dup_object where needed.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39248
diff
changeset
|
289 | media->priv->media = g_value_dup_object(value); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
290 | g_signal_connect_swapped(G_OBJECT(media->priv->accept), "activate", |
|
26501
c186275f46aa
Remove purple_media_accept.
Michael Ruprecht <maiku@pidgin.im>
parents:
26500
diff
changeset
|
291 | G_CALLBACK(finch_media_accept_cb), media->priv->media); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
292 | g_signal_connect_swapped(G_OBJECT(media->priv->reject), "activate", |
|
26500
8fc1146ee03c
Remove purple_media_reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26499
diff
changeset
|
293 | G_CALLBACK(finch_media_reject_cb), media->priv->media); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
294 | g_signal_connect_swapped(G_OBJECT(media->priv->hangup), "activate", |
|
26499
759bf410db86
Remove purple_media_hangup.
Michael Ruprecht <maiku@pidgin.im>
parents:
26496
diff
changeset
|
295 | G_CALLBACK(finch_media_hangup_cb), media->priv->media); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
296 | |
|
26514
058053cffc0e
Add purple_media_is_initiator.
Michael Ruprecht <maiku@pidgin.im>
parents:
26508
diff
changeset
|
297 | if (purple_media_is_initiator(media->priv->media, |
|
058053cffc0e
Add purple_media_is_initiator.
Michael Ruprecht <maiku@pidgin.im>
parents:
26508
diff
changeset
|
298 | NULL, NULL) == TRUE) { |
|
26244
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
299 | finch_media_wait_cb(media->priv->media, media); |
|
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
300 | } |
|
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
301 | g_signal_connect(G_OBJECT(media->priv->media), "state-changed", |
|
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
302 | G_CALLBACK(finch_media_state_changed_cb), media); |
|
26445
6da3853c89c2
Use stream-info instead of state-changed for reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26248
diff
changeset
|
303 | g_signal_connect(G_OBJECT(media->priv->media), "stream-info", |
|
6da3853c89c2
Use stream-info instead of state-changed for reject.
Michael Ruprecht <maiku@pidgin.im>
parents:
26248
diff
changeset
|
304 | G_CALLBACK(finch_media_stream_info_cb), media); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
305 | break; |
|
26244
5b2642b82431
Update Finch to new media API.
Michael Ruprecht <maiku@pidgin.im>
parents:
26183
diff
changeset
|
306 | } |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
307 | default: |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
308 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
309 | break; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
310 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
311 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
312 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
313 | static void |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
314 | finch_media_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
315 | { |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
316 | FinchMedia *media; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
317 | g_return_if_fail(FINCH_IS_MEDIA(object)); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
318 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
319 | media = FINCH_MEDIA(object); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
320 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
321 | switch (prop_id) { |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
322 | case PROP_MEDIA: |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
323 | g_value_set_object(value, media->priv->media); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
324 | break; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
325 | default: |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
29106
diff
changeset
|
326 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
327 | break; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
328 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
329 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
330 | |
|
26506
5f8ab0b75892
Silence two more warnings.
Michael Ruprecht <maiku@pidgin.im>
parents:
26505
diff
changeset
|
331 | static GntWidget * |
|
23721
15285d082f6c
Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Michael Ruprecht <maiku@pidgin.im>
parents:
23704
diff
changeset
|
332 | finch_media_new(PurpleMedia *media) |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
333 | { |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
334 | return GNT_WIDGET(g_object_new(finch_media_get_type(), |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
335 | "media", media, |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
336 | "vertical", FALSE, |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
337 | "homogeneous", FALSE, |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
338 | NULL)); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
339 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
340 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
341 | static void |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
342 | gntmedia_message_cb(FinchMedia *gntmedia, const char *msg, PurpleConversation *conv) |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
343 | { |
|
34657
b10d6297ffd5
Refactored finch to use the GObject conversation API
Ankit Vani <a@nevitus.org>
parents:
34627
diff
changeset
|
344 | if (PURPLE_IS_IM_CONVERSATION(conv)) { |
|
36084
2172bd6dad3e
Add purple_conversation_write_system_message
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35454
diff
changeset
|
345 | purple_conversation_write_system_message(conv, msg, 0); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
346 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
347 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
348 | |
|
26111
d25772351a75
Stop additional media sessions within a single conversation for grouped contacts.
Michael Ruprecht <maiku@pidgin.im>
parents:
26099
diff
changeset
|
349 | static gboolean |
|
26183
d78798f480da
Remove connection attribute from PurpleMedia.
Michael Ruprecht <maiku@pidgin.im>
parents:
26176
diff
changeset
|
350 | finch_new_media(PurpleMediaManager *manager, PurpleMedia *media, |
|
26746
2a2d45ac9774
Switch media to store accounts rather than connections.
Michael Ruprecht <maiku@pidgin.im>
parents:
26647
diff
changeset
|
351 | PurpleAccount *account, gchar *name, gpointer null) |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
352 | { |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
353 | GntWidget *gntmedia; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
354 | PurpleConversation *conv; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
355 | |
|
34657
b10d6297ffd5
Refactored finch to use the GObject conversation API
Ankit Vani <a@nevitus.org>
parents:
34627
diff
changeset
|
356 | conv = PURPLE_CONVERSATION(purple_im_conversation_new(account, name)); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
357 | |
|
23721
15285d082f6c
Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Michael Ruprecht <maiku@pidgin.im>
parents:
23704
diff
changeset
|
358 | gntmedia = finch_media_new(media); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
359 | g_signal_connect(G_OBJECT(gntmedia), "message", G_CALLBACK(gntmedia_message_cb), conv); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
360 | FINCH_MEDIA(gntmedia)->priv->conv = conv; |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
361 | finch_conversation_set_info_widget(conv, gntmedia); |
|
26111
d25772351a75
Stop additional media sessions within a single conversation for grouped contacts.
Michael Ruprecht <maiku@pidgin.im>
parents:
26099
diff
changeset
|
362 | return TRUE; |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
363 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
364 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
365 | static PurpleCmdRet |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
366 | call_cmd_cb(PurpleConversation *conv, const char *cmd, char **args, |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
367 | char **eror, gpointer data) |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
368 | { |
|
26099
2ba28e840a95
Convert serv_* media functions to purple_prpl_* functions.
Michael Ruprecht <maiku@pidgin.im>
parents:
23721
diff
changeset
|
369 | PurpleAccount *account = purple_conversation_get_account(conv); |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
370 | |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
34728
diff
changeset
|
371 | if (!purple_protocol_initiate_media(account, |
|
26123
4948b40fdbec
Make voice calls work with Finch.
Michael Ruprecht <maiku@pidgin.im>
parents:
26111
diff
changeset
|
372 | purple_conversation_get_name(conv), |
|
26495
52846ebe1c7d
Don't assume a PurpleMedia instance will be created immediately.
Michael Ruprecht <maiku@pidgin.im>
parents:
26488
diff
changeset
|
373 | PURPLE_MEDIA_AUDIO)) |
|
34458
5c9d451155c5
Clang warnings: clean up finch
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31294
diff
changeset
|
374 | return PURPLE_CMD_RET_FAILED; |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
375 | |
|
34458
5c9d451155c5
Clang warnings: clean up finch
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
31294
diff
changeset
|
376 | return PURPLE_CMD_RET_OK; |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
377 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
378 | |
|
26505
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
379 | #endif /* USE_VV */ |
|
26450
99c5f4c41446
Make voice calls in Finch work again.
Michael Ruprecht <maiku@pidgin.im>
parents:
26449
diff
changeset
|
380 | |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
381 | void finch_media_manager_init(void) |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
382 | { |
|
26505
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
383 | #ifdef USE_VV |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
384 | PurpleMediaManager *manager = purple_media_manager_get(); |
|
38027
bd088b2700cd
Fix crash if VV config device prefs are unset.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
37911
diff
changeset
|
385 | PurpleMediaElementInfo *audio_src = NULL; |
|
bd088b2700cd
Fix crash if VV config device prefs are unset.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
37911
diff
changeset
|
386 | PurpleMediaElementInfo *audio_sink = NULL; |
|
37885
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
387 | const char *pref; |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
388 | |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
389 | pref = purple_prefs_get_string( |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
390 | FINCH_PREFS_ROOT "/vvconfig/audio/src/device"); |
|
38027
bd088b2700cd
Fix crash if VV config device prefs are unset.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
37911
diff
changeset
|
391 | if (pref) |
|
bd088b2700cd
Fix crash if VV config device prefs are unset.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
37911
diff
changeset
|
392 | audio_src = purple_media_manager_get_element_info(manager, pref); |
|
37885
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
393 | if (!audio_src) { |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
394 | pref = "autoaudiosrc"; |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
395 | purple_prefs_set_string( |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
396 | FINCH_PREFS_ROOT "/vvconfig/audio/src/device", pref); |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
397 | audio_src = purple_media_manager_get_element_info(manager, |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
398 | pref); |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
399 | } |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
400 | |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
401 | pref = purple_prefs_get_string( |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
402 | FINCH_PREFS_ROOT "/vvconfig/audio/sink/device"); |
|
38027
bd088b2700cd
Fix crash if VV config device prefs are unset.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
37911
diff
changeset
|
403 | if (pref) |
|
bd088b2700cd
Fix crash if VV config device prefs are unset.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
37911
diff
changeset
|
404 | audio_sink = purple_media_manager_get_element_info(manager, pref); |
|
37885
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
405 | if (!audio_sink) { |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
406 | pref = "autoaudiosink"; |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
407 | purple_prefs_set_string( |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
408 | FINCH_PREFS_ROOT "/vvconfig/audio/sink/device", pref); |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
409 | audio_sink = purple_media_manager_get_element_info(manager, |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
410 | pref); |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
411 | } |
|
26616
4f58db29d346
Hide and gobjectify PurpleMediaElementInfo.
Michael Ruprecht <maiku@pidgin.im>
parents:
26524
diff
changeset
|
412 | |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
413 | g_signal_connect(G_OBJECT(manager), "init-media", G_CALLBACK(finch_new_media), NULL); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
414 | purple_cmd_register("call", "", PURPLE_CMD_P_DEFAULT, |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
415 | PURPLE_CMD_FLAG_IM, NULL, |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
416 | call_cmd_cb, _("call: Make an audio call."), NULL); |
|
26450
99c5f4c41446
Make voice calls in Finch work again.
Michael Ruprecht <maiku@pidgin.im>
parents:
26449
diff
changeset
|
417 | |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
29106
diff
changeset
|
418 | purple_media_manager_set_ui_caps(manager, |
|
26521
f7f083e8cd31
Declare which media caps Pidgin and Finch handle.
Michael Ruprecht <maiku@pidgin.im>
parents:
26514
diff
changeset
|
419 | PURPLE_MEDIA_CAPS_AUDIO | |
|
f7f083e8cd31
Declare which media caps Pidgin and Finch handle.
Michael Ruprecht <maiku@pidgin.im>
parents:
26514
diff
changeset
|
420 | PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION); |
|
f7f083e8cd31
Declare which media caps Pidgin and Finch handle.
Michael Ruprecht <maiku@pidgin.im>
parents:
26514
diff
changeset
|
421 | |
|
26450
99c5f4c41446
Make voice calls in Finch work again.
Michael Ruprecht <maiku@pidgin.im>
parents:
26449
diff
changeset
|
422 | purple_debug_info("gntmedia", "Registering media element types\n"); |
|
37885
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
423 | purple_media_manager_set_active_element(manager, audio_src); |
|
f12d4064eeae
pidgin/finch: use GStreamer-provided VV elements
Jakub Adam <jakub.adam@ktknet.cz>
parents:
37880
diff
changeset
|
424 | purple_media_manager_set_active_element(manager, audio_sink); |
|
26505
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
425 | #endif |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
426 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
427 | |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
428 | void finch_media_manager_uninit(void) |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
429 | { |
|
26505
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
430 | #ifdef USE_VV |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
431 | PurpleMediaManager *manager = purple_media_manager_get(); |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
432 | g_signal_handlers_disconnect_by_func(G_OBJECT(manager), |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
433 | G_CALLBACK(finch_new_media), NULL); |
|
26505
1b8e849bbc4d
Hide FinchMedia and related structures.
Michael Ruprecht <maiku@pidgin.im>
parents:
26501
diff
changeset
|
434 | #endif |
|
22650
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
435 | } |
|
3ed9cc16bf2a
Some media support in finch. This needs to be updated for the got-accept signal.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
diff
changeset
|
436 | |
|
23700
e47be56bdd2b
Fix compiling with the --disable-vv switch.
Michael Ruprecht <maiku@pidgin.im>
parents:
23697
diff
changeset
|
437 |