Changeset 10bf3688a120e8d2cb500ec5503a8242ff31a8da

Show
Ignore:
Timestamp:
18/03/03 02:26:13 (6 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1047950773 +0000
git-parent:

[db7c69ed67fc0df5a21e3b303b574ae8453dee5f]

git-author:
Sam Hocevar <sam@videolan.org> 1047950773 +0000
Message:
  • ./modules/gui/gtk2/*: skeletons of Gtk-2.0 and GNOME-2 plugins.
  • ./toolbox: added --update-glade2 flag.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/Makefile.am

    r3dcb134 r10bf368  
    4343    gui/familiar/Modules.am \ 
    4444    gui/gtk/Modules.am \ 
     45    gui/gtk2/Modules.am \ 
    4546    gui/kde/Modules.am \ 
    4647    gui/macosx/Modules.am \ 
    …… 
    6869    video_output/x11/Modules.am \ 
    6970    visualization/scope/Modules.am \ 
    70     visualization/xosd/Modules.am 
     71    visualization/xosd/Modules.am \ 
     72    $(NULL) 
    7173 

  • modules/misc/Modules.am

    r312754c r10bf368  
    11SOURCES_gtk_main = modules/misc/gtk_main.c 
    22SOURCES_gnome_main = modules/misc/gtk_main.c 
     3SOURCES_gtk2_main = modules/misc/gtk_main.c 
     4SOURCES_gnome2_main = modules/misc/gtk_main.c 
    35SOURCES_sap = modules/misc/sap.c 
    46SOURCES_screensaver = modules/misc/screensaver.c 

  • modules/misc/gtk_main.c

    r2b013d3 r10bf368  
    33 ***************************************************************************** 
    44 * Copyright (C) 2002 VideoLAN 
    5  * $Id: gtk_main.c,v 1.12 2003/03/17 18:02:10 sam Exp $ 
     5 * $Id: gtk_main.c,v 1.13 2003/03/18 01:26:13 sam Exp $ 
    66 * 
    77 * Authors: Samuel Hocevar <sam@zoy.org> 
    …… 
    176176    /* gdk_threads_init(); */ 
    177177 
    178 #if defined(MODULE_NAME_IS_gnome_main) || defined(MODULE_NAME_IS_gnome2_main) 
     178#if defined(MODULE_NAME_IS_gnome_main) 
    179179    gnome_init( p_this->p_vlc->psz_object_name, VERSION, i_args, p_args ); 
     180#elif defined(MODULE_NAME_IS_gnome2_main) 
     181    gnome_program_init( PACKAGE, VERSION, LIBGNOMEUI_MODULE, 
     182                        i_args, p_args, 
     183                        GNOME_PARAM_APP_DATADIR, "",//PACKAGE_DATA_DIR, 
     184                        NULL ); 
    180185#else 
    181186    gtk_set_locale(); 

  • toolbox

    r453fe58 r10bf368  
    22 
    33##  toolbox for the VLC media player 
    4 ##  $Id: toolbox,v 1.15 2003/03/17 16:59:46 sam Exp $ 
     4##  $Id: toolbox,v 1.16 2003/03/18 01:26:13 sam Exp $ 
    55## 
    66##  Authors: Samuel Hocevar <sam@zoy.org> 
    …… 
    2626  --update-includes [BUILTINS]  generate various include files 
    2727  --update-glade                generate and fix Glade code 
     28  --update-glade2               generate and fix Glade 2 code 
    2829EOF 
    2930  exit 1 
    …… 
    6465  --update-glade|--fix-glade) 
    6566    action=glade 
     67    ;; 
     68  --update-glade2|--update-glade-2|--fix-glade2) 
     69    action=glade2 
    6670    ;; 
    6771  --help) 
    …… 
    455459fi 
    456460 
     461## 
     462##  Fix glade2-generated files 
     463## 
     464if test "${action}" = "glade2" 
     465then 
     466  for file in modules/gui/gtk2/gnome2.glade modules/gui/gtk2/gtk2.glade 
     467  do 
     468    echo "generating code from $file" 
     469    glade-2 -w $file || exit 1 
     470  done 
     471 
     472  exit 0 
     473fi 
     474