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

call the real gnome-libs API rather than my hacked one

Browse source 
2000-12-27  Jacob "Ulysses" Berkman  <jacob@helixcode.com>

	* capplet-dir-view-list.c (list_populate): call the real
	gnome-libs API rather than my hacked one

	* capplet-dir.c (start_capplet_through_root_manager): pass the
	correct path ($prefix/sbin/<tool>) to the root-manager
	(capplet_activate): check that the Exec line begins with
	root-manager rather than root-manager-helper (for now)
This commit is contained in:
Jacob "Ulysses" Berkman 2000-12-27 20:33:41 +00:00 • committed by Jacob Berkman
parent 99ae2dc98f
commit 4ae300397d
4 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
control-center/ChangeLog
View file

@ -1,3 +1,13 @@
2000-12-27 Jacob "Ulysses" Berkman <jacob@helixcode.com>
* capplet-dir-view-list.c (list_populate): call the real
gnome-libs API rather than my hacked one
* capplet-dir.c (start_capplet_through_root_manager): pass the
correct path ($prefix/sbin/<tool>) to the root-manager
(capplet_activate): check that the Exec line begins with
root-manager rather than root-manager-helper (for now)
2000-12-26 Jacob "Ulysses" Berkman <jacob@helixcode.com> 2000-12-26 Jacob "Ulysses" Berkman <jacob@helixcode.com>
* capplet-dir-view*.c: new html view, and split other views into * capplet-dir-view*.c: new html view, and split other views into

3
control-center/Makefile.am
View file

@ -18,7 +18,8 @@ INCLUDES = \
-DVERSION=\""$(VERSION)"\" \ -DVERSION=\""$(VERSION)"\" \
-DSETTINGS_DIR=\""$(datadir)/control-center"\" \ -DSETTINGS_DIR=\""$(datadir)/control-center"\" \
$(LIBGLADE_CFLAGS) \ $(LIBGLADE_CFLAGS) \
-DPIXMAPS_DIR=\""$(appicondir)"\" -DPIXMAPS_DIR=\""$(appicondir)"\" \
-DGNOME_SBINDIR=\""$(sbindir)"\"
bin_PROGRAMS = gnomecc bin_PROGRAMS = gnomecc

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

@ -108,10 +108,16 @@ list_populate (CappletDirView *view)
gnome_icon_list_freeze (GNOME_ICON_LIST (view->view)); gnome_icon_list_freeze (GNOME_ICON_LIST (view->view));
for (i = 0, list = view->capplet_dir->entries; list; list = list->next, i++) { for (i = 0, list = view->capplet_dir->entries; list; list = list->next, i++) {
#if 0
item = flatten_alpha (CAPPLET_DIR_ENTRY (list->data)->pb, item = flatten_alpha (CAPPLET_DIR_ENTRY (list->data)->pb,
GNOME_CANVAS (view->view)); GNOME_CANVAS (view->view));
gnome_icon_list_insert_item (GNOME_ICON_LIST (view->view), i, item, gnome_icon_list_insert_item (GNOME_ICON_LIST (view->view), i, item,
CAPPLET_DIR_ENTRY (list->data)->label); CAPPLET_DIR_ENTRY (list->data)->label);
#else
gnome_icon_list_insert (GNOME_ICON_LIST (view->view), i,
CAPPLET_DIR_ENTRY (list->data)->icon,
CAPPLET_DIR_ENTRY (list->data)->label);
#endif
} }
gnome_icon_list_thaw (GNOME_ICON_LIST (view->view)); gnome_icon_list_thaw (GNOME_ICON_LIST (view->view));
} }

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

@ -197,7 +197,8 @@ capplet_activate (Capplet *capplet)
entry = CAPPLET_DIR_ENTRY (capplet)->entry; entry = CAPPLET_DIR_ENTRY (capplet)->entry;
if (!strcmp (entry->exec[0], "root-manager-helper")) #warning FIXME: this should probably be root-manager-helper
if (!strncmp (entry->exec[0], "root-manager", 12))
start_capplet_through_root_manager (entry); start_capplet_through_root_manager (entry);
else else
gnome_desktop_entry_launch (entry); gnome_desktop_entry_launch (entry);
@ -345,9 +346,9 @@ start_capplet_through_root_manager (GnomeDesktopEntry *gde)
oldexec = gde->exec[1]; oldexec = gde->exec[1];
gde->exec[1] = gnome_is_program_in_path (oldexec); gde->exec[1] = g_concat_dir_and_file (GNOME_SBINDIR, oldexec);
cmdline = g_strjoinv (" ", gde->exec + 1); cmdline = g_strjoinv (" ", gde->exec + 1);
g_free (gde->exec[1]); g_free (gde->exec[1]);
gde->exec[1] = oldexec; gde->exec[1] = oldexec;