applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Excluded capplet-dir-view-tree from SOURCES so the whole thing builds

Browse source 
deprecated clean now.
This commit is contained in:
Lauris Kaplinski 2002-02-14 13:29:09 +00:00
parent 1eef9d7561
commit f10263de73
8 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
control-center/ChangeLog
View file

@ -1,3 +1,22 @@
2002-02-14 Lauris Kaplinski <lauris@ximian.com>
* capplet-dir-view-tree.c: Remove #undef GTK_DISABLE_DEPRECATED,
so if included again we see warnings
* capplet-dir.c: Remove <bonobo.h> which was unused
* main.c: Remove <bonobo.h> which was unused
* preferences.c (read_preferences): Remove LAYOUT_TREE
(place_preferences): Ditto
* preferences.h: Remove LAYOUT_TREE from preferences
* capplet-dir-view.c: Removed capplet_dir_view_tree
(capplet_dir_view_set_prop): Ditto
* Makefile.am: Remove capplet-dir-view-tree from SOURCES
2002-02-12 Lauris Kaplinski <lauris@ximian.com>
* preferences.c (prefs_dialog_ok_cb): Destroy widget instead of

3
control-center/Makefile.am
View file

@ -40,9 +40,10 @@ gnome2_control_center_SOURCES = \
capplet-dir.c capplet-dir.h \
capplet-dir-view.c capplet-dir-view.h \
preferences.c preferences.h \
capplet-dir-view-tree.c \
capplet-dir-view-list.c
# capplet-dir-view-tree.c \
gnome2_control_center_LDADD = \
@GNOMECC_LIBS@ \
-lgnome-desktop-2

4
control-center/capplet-dir-view-tree.c
View file

@ -22,10 +22,6 @@
* 02111-1307, USA.
*/
#ifdef GTK_DISABLE_DEPRECATED
#undef GTK_DISABLE_DEPRECATED
#endif
#include <config.h>
#include "capplet-dir-view.h"

6
control-center/capplet-dir-view.c
View file

@ -32,12 +32,16 @@
#include "capplet-dir-view.h"
extern CappletDirViewImpl capplet_dir_view_list;
#if 0
extern CappletDirViewImpl capplet_dir_view_tree;
#endif
CappletDirViewImpl *capplet_dir_view_impl[] = {
NULL,
&capplet_dir_view_list,
#if 0
&capplet_dir_view_tree,
#endif
};
static GObjectClass *parent_class;
@ -174,7 +178,7 @@ capplet_dir_view_set_prop (GObject *object, guint prop_id, const GValue *value,
#ifdef USE_HTML
layout = CLAMP (g_value_get_int (value), 0, LAYOUT_HTML);
#else
layout = CLAMP (g_value_get_int (value), 0, LAYOUT_TREE);
layout = CLAMP (g_value_get_int (value), 0, LAYOUT_ICON_LIST);
#endif
if (layout == view->layout)

1
control-center/capplet-dir.c
View file

@ -27,7 +27,6 @@
#include <string.h>
#include <glib.h>
#include <bonobo.h>
#include <sys/stat.h>
#include <sys/types.h>

1
control-center/main.c
View file

@ -28,7 +28,6 @@
#include <string.h>
#include <gnome.h>
#include <glade/glade.h>
#include <bonobo.h>
#include <gconf/gconf.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>

4
control-center/preferences.c
View file

@ -183,7 +183,9 @@ place_preferences (GladeXML *prefs_data, GnomeCCPreferences *prefs)
#ifdef USE_HTML
case LAYOUT_HTML: w = "html_widget"; break;
#endif
#if 0
case LAYOUT_TREE: w = "tree_widget"; break;
#endif
case LAYOUT_ICON_LIST: w = "icon_list_widget"; break;
default: w = NULL; break;
}
@ -209,7 +211,7 @@ read_preferences (GladeXML *prefs_data, GnomeCCPreferences *prefs)
widget = glade_xml_get_widget (prefs_data, "tree_widget");
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
prefs->layout = LAYOUT_TREE;
prefs->layout = LAYOUT_ICON_LIST;
else {
#ifdef USE_HTML
widget = glade_xml_get_widget (prefs_data, "html_widget");

2
control-center/preferences.h
View file

@ -27,7 +27,9 @@
typedef enum _CappletDirViewLayout {
LAYOUT_NONE,
LAYOUT_ICON_LIST,
#if 0
LAYOUT_TREE,
#endif
#ifdef USE_HTML
LAYOUT_HTML
#endif