Changeset 214:8ee3e5aaf58c in mediastreamer2

Timestamp:

Jan 3, 2009 10:38:33 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

add update notification

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@217 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone

Files:

• gtk-glade/linphone.dev (modified) (3 diffs)
• gtk-glade/linphone.h (modified) (1 diff)
• gtk-glade/main.c (modified) (2 diffs)
• gtk-glade/update.c (added)
• mediastreamer2/src/videoout.c (modified) (2 diffs)

linphone/gtk-glade/linphone.dev

@@ -2 +2 @@
 FileName=linphone.dev
 Name=linphone
-UnitCount=8
+UnitCount=9
 PchHead=-1
 PchSource=-1
@@ -121 +121 @@
 Compiler=-ggdb -O2_@@_-DENABLE_NLS_@@__@@_
 CppCompiler=
-Linker=-mwindows_@@_-Wl,--export-all-symbols_@@_-Wl,--add-stdcall-alias_@@_-llinphone_@@_-lmediastreamer2_@@_-lortp_@@_-lglade-2.0_@@_-lgtk-win32-2.0_@@_-lglib-2.0_@@_-lintl_@@_-lgdk_pixbuf-2.0_@@_-latk-1.0_@@_-lgobject-2.0_@@_-lgthread-2.0_@@_-lgdk-win32-2.0_@@_-losip2_@@_-losipparser2_@@_-leXosip2_@@_-lws2_32_@@_
+Linker=-mwindows_@@_-Wl,--export-all-symbols_@@_-Wl,--add-stdcall-alias_@@_-llinphone_@@_-lmediastreamer2_@@_-lortp_@@_-lglade-2.0_@@_-lgtk-win32-2.0_@@_-lglib-2.0_@@_-lintl_@@_-lgdk_pixbuf-2.0_@@_-latk-1.0_@@_-lgobject-2.0_@@_-lgthread-2.0_@@_-lgdk-win32-2.0_@@_-losip2_@@_-losipparser2_@@_-leXosip2_@@_-lws2_32_@@_-lwininet_@@_
 PreprocDefines=
 CompilerSettings=0000000000000000000000
@@ -165 +165 @@
 compilerType=1
 
+[Unit9]
+FileName=update.c
+CompileCpp=0
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=       $(CC) -c update.c -o Objects/update.o $(CFLAGS)
+

linphone/gtk-glade/linphone.h

@@ -60 +60 @@
 const gchar *linphone_gtk_get_ui_config(const char *key, const char *def);
 int linphone_gtk_get_ui_config_int(const char *key, int def);
-
+void linphone_gtk_open_browser(const char *url);
+void linphone_gtk_check_for_new_version(void);

linphone/gtk-glade/main.c

@@ -612 +612 @@
 }
 
+void linphone_gtk_open_browser(const char *url){
+#ifdef WIN32
+        ShellExecute(0,"open",url,NULL,NULL,1);
+#else
+        char cl[255];
+        snprintf(cl,sizeof(cl),"/usr/bin/x-www-browser %s",url);
+        g_spawn_command_line_async(cl,NULL);
+#endif
+}
+
 void linphone_gtk_link_to_website(GtkWidget *item){
         const gchar *home=(const gchar*)g_object_get_data(G_OBJECT(item),"home");
-#ifdef WIN32
-        ShellExecute(0,"open",home,NULL,NULL,1);
-#else
-        char cl[255];
-        snprintf(cl,sizeof(cl),"/usr/bin/x-www-browser %s",home);
-        g_spawn_command_line_async(cl,NULL);
-#endif
+        linphone_gtk_open_browser(home);
 }
 
@@ -862 +866 @@
         linphone_gtk_init_status_icon();
         linphone_gtk_show_main_window();
+        linphone_gtk_check_for_new_version();
         gtk_main();
         gdk_threads_leave();

linphone/mediastreamer2/src/videoout.c

@@ -353 +353 @@
                 }else{
                         wd->window=create_window(wd->fb.w,wd->fb.h);
-                        obj->window_id=wd->window;
+                        obj->window_id=(long)wd->window;
                         if (wd->window!=NULL) SetWindowLongPtr(wd->window,GWLP_USERDATA,(LONG_PTR)obj);
                         else return FALSE;
@@ -462 +462 @@
         if (wd==NULL)
                 return;
-        if (wd->window && !obj->window_id) DestroyWindow(wd->window);
+        if (wd->window && !obj->use_external_window) DestroyWindow(wd->window);
         if (wd->ddh) DrawDibClose(wd->ddh);
         if (wd->fb.planes[0]) ms_free(wd->fb.planes[0]);