← Back to branch summary

~ubuntu-branches/ubuntu/vivid/linphone/vivid

« back to all changes in this revision

Viewing changes to gnome/applet.c

  • Committer: Bazaar Package Importer
  • Author(s): Samuel Mimram
  • Date: 2006-11-15 10:34:50 UTC
  • mfrom: (1.2.1 upstream) (2.1.8 feisty)
  • Revision ID: james.westby@ubuntu.com-20061115103450-qgafwcks2lkhctlj
http://bugs.debian.org/398307
* New upstream release.
* Enable video support.
* Fix mismatched #endif in mscommon.h, closes: #398307.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome/applet.c
25
25
LinphoneCore core;
26
26
LinphoneGnomeUI ui;
27
27
static int show=0;
28
 
static int firstime=1;
29
28
static gulong signal_ref;
30
29
static GtkWidget *applet_button=NULL;
31
30
static GdkPixbuf *original_icon=NULL;
111
110
linphone_applet_fill (PanelApplet *applet)
112
111
{
113
112
        gint size=panel_applet_get_size(applet);
114
 
        GtkWidget *frame;
115
 
        
116
113
        
117
114
        applet_button=gtk_frame_new(NULL);
118
115
        gtk_container_add(GTK_CONTAINER(applet),applet_button);
154
151
                            const gchar *iid,
155
152
                            gpointer     data)
156
153
{
157
 
        gboolean retval;
158
154
        static int instances=0;
159
155
        GtkWidget *dialog;
160
156
        if (!strcmp (iid, "OAFIID:GNOME_LinphoneApplet")){
171
167
                        gtk_widget_show(GTK_WIDGET(dialog));
172
168
                        return FALSE;
173
169
                }
174
 
                retval = linphone_applet_fill (applet); 
 
170
                return linphone_applet_fill (applet); 
175
171
    }
176
 
        return retval;
 
172
        return FALSE;
177
173
}
178
174
 
179
175
#define GNOMELOCALEDIR PACKAGE_LOCALE_DIR
184
180
                             "0",
185
181
                             linphone_applet_factory,
186
182
                             NULL)
187
 
 
188