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

Update unrefs (config_manager_dialog_init): GLADE_DIR -> GLADE_DATADIR

Browse source 
2001-01-24  Bradford Hovinen  <hovinen@ximian.com>

	* config-manager-dialog.c (config_manager_dialog_finalize): Update
	unrefs
	(config_manager_dialog_init): GLADE_DIR -> GLADE_DATADIR
	(config_manager_dialog_init): Remove outdated signal connections
	(config_manager_dialog_init): Remove code to create location list

	* Makefile.am (INCLUDES): Changed CAPPLET_CFLAGS to
	ROLLBACK_CAPPLET_CFLAGS
	(rollback_capplet_LDADD): Ditto for CAPPLET_LIBS

	* config-manager-dialog.c: Remove #include
	"create-location-dialog.h" and #include "location-list.h"; set all
	the includes from libarchiver to get their files from the right
	directory
This commit is contained in:
Bradford Hovinen 2001-01-24 19:01:49 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent 8887ceecf1
commit 7907e0962f
5 changed files with 30 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

17
capplets/rollback/ChangeLog
View file

@ -1,3 +1,20 @@
2001-01-24 Bradford Hovinen <hovinen@ximian.com>
* config-manager-dialog.c (config_manager_dialog_finalize): Update
unrefs
(config_manager_dialog_init): GLADE_DIR -> GLADE_DATADIR
(config_manager_dialog_init): Remove outdated signal connections
(config_manager_dialog_init): Remove code to create location list
* Makefile.am (INCLUDES): Changed CAPPLET_CFLAGS to
ROLLBACK_CAPPLET_CFLAGS
(rollback_capplet_LDADD): Ditto for CAPPLET_LIBS
* config-manager-dialog.c: Remove #include
"create-location-dialog.h" and #include "location-list.h"; set all
the includes from libarchiver to get their files from the right
directory
2001-01-18 Bradford Hovinen <hovinen@ximian.com>
* config-manager-dialog.c (do_rollback): Rewrite, add boolean

4
capplets/rollback/Makefile.am
View file

@ -21,7 +21,7 @@ INCLUDES = \
-DG_LOG_DOMAIN=\"background-properties\" \
-DGLADE_DATADIR=\""$(Gladedir)"\" \
$(GNOME_INCLUDEDIR) \
$(CAPPLET_CFLAGS) \
$(ROLLBACK_CAPPLET_CFLAGS) \
-I$(top_srcdir)/ \
-I$(top_srcdir)/intl
@ -33,4 +33,4 @@ rollback_capplet_SOURCES = \
main.c
rollback_capplet_LDADD = \
$(GNOME_LIBDIR) $(CAPPLET_LIBS)
$(GNOME_LIBDIR) $(ROLLBACK_CAPPLET_LIBS)

55
capplets/rollback/config-manager-dialog.c
View file

@ -29,12 +29,11 @@
#include <glade/glade.h>
#include <ximian-archiver/archive.h>
#include <ximian-archiver/location.h>
#include <ximian-archiver/backend-list.h>
#include "config-manager-dialog.h"
#include "create-location-dialog.h"
#include "archive.h"
#include "location.h"
#include "backend-list.h"
#include "location-list.h"
#define WID(str) (glade_xml_get_widget (dialog->p->config_dialog_data, str))
@ -140,7 +139,7 @@ config_manager_dialog_init (ConfigManagerDialog *dialog)
dialog->p = g_new0 (ConfigManagerDialogPrivate, 1);
dialog->p->config_dialog_data =
glade_xml_new (GLADE_DIR "/rollback.glade",
glade_xml_new (GLADE_DATADIR "/rollback.glade",
"config_dialog_data");
gtk_box_pack_start (GTK_BOX
@ -172,34 +171,10 @@ config_manager_dialog_init (ConfigManagerDialog *dialog)
"rollback_one_toggled_cb",
rollback_one_toggled_cb,
dialog);
glade_xml_signal_connect_data (dialog->p->config_dialog_data,
"create_cb",
create_cb,
dialog);
glade_xml_signal_connect_data (dialog->p->config_dialog_data,
"rename_cb",
rename_cb,
dialog);
glade_xml_signal_connect_data (dialog->p->config_dialog_data,
"destroy_cb",
destroy_cb,
dialog);
glade_xml_signal_connect_data (dialog->p->config_dialog_data,
"change_location_cb",
change_location_cb,
dialog);
glade_xml_signal_connect_data (dialog->p->config_dialog_data,
"edit_location_cb",
edit_location_cb,
dialog);
dialog->p->rollback_all = TRUE;
dialog->p->date = g_new (struct tm, 1);
gtk_widget_show (GTK_WIDGET (dialog->p->location_list));
gtk_container_add (GTK_CONTAINER (WID ("location_tree_location")),
GTK_WIDGET (dialog->p->location_list));
set_backend_controls_sensitive (dialog, FALSE);
reset_time (dialog, 0);
}
@ -251,7 +226,7 @@ config_manager_dialog_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
archive_get_backend_list (dialog->p->archive);
dialog->p->current_location =
archive_get_current_location (dialog->p->archive);
populate_backends_list (dialog, dialog->p->user_list);
populate_backends_list (dialog, dialog->p->backend_list);
break;
@ -295,21 +270,9 @@ config_manager_dialog_finalize (GtkObject *object)
if (dialog->p->date != NULL)
g_free (dialog->p->date);
if (dialog->p->type == CM_DIALOG_USER_ONLY ||
dialog->p->type == CM_DIALOG_BOTH)
{
gtk_object_unref (GTK_OBJECT (dialog->p->current_user));
gtk_object_unref (GTK_OBJECT (dialog->p->user_list));
gtk_object_unref (GTK_OBJECT (dialog->p->user_archive));
}
if (dialog->p->type == CM_DIALOG_GLOBAL_ONLY ||
dialog->p->type == CM_DIALOG_BOTH)
{
gtk_object_unref (GTK_OBJECT (dialog->p->current_global));
gtk_object_unref (GTK_OBJECT (dialog->p->global_list));
gtk_object_unref (GTK_OBJECT (dialog->p->global_archive));
}
gtk_object_unref (GTK_OBJECT (dialog->p->current_location));
gtk_object_unref (GTK_OBJECT (dialog->p->backend_list));
gtk_object_unref (GTK_OBJECT (dialog->p->archive));
g_free (dialog->p);

2
capplets/rollback/main.c
View file

@ -41,7 +41,7 @@ main (int argc, char **argv)
gnome_init ("config-manager", VERSION, argc, argv);
glade_gnome_init ();
dialog = config_manager_dialog_new (CM_DIALOG_USER_ONLY);
dialog = config_manager_dialog_new (CM_DIALOG_USER);
gtk_widget_show (dialog);
gtk_signal_connect (GTK_OBJECT (dialog), "destroy",

11
capplets/rollback/rollback.glade
View file

@ -139,7 +139,6 @@
<name>button4</name>
<can_focus>True</can_focus>
<label>View Logs...</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
@ -161,7 +160,6 @@
<name>button5</name>
<can_focus>True</can_focus>
<label>Advanced...</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
@ -358,7 +356,6 @@
<last_modification_time>Wed, 20 Dec 2000 23:51:41 GMT</last_modification_time>
</signal>
<label>Create...</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>0</padding>
<expand>False</expand>
@ -376,7 +373,6 @@
<last_modification_time>Wed, 20 Dec 2000 23:51:56 GMT</last_modification_time>
</signal>
<label>Destroy...</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>0</padding>
<expand>False</expand>
@ -394,7 +390,6 @@
<last_modification_time>Wed, 20 Dec 2000 23:52:13 GMT</last_modification_time>
</signal>
<label>Rename...</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>0</padding>
<expand>False</expand>
@ -422,7 +417,6 @@
<last_modification_time>Wed, 20 Dec 2000 23:52:33 GMT</last_modification_time>
</signal>
<label>Change to this Location</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>0</padding>
<expand>False</expand>
@ -440,7 +434,6 @@
<last_modification_time>Wed, 20 Dec 2000 23:52:51 GMT</last_modification_time>
</signal>
<label>Edit this Location</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>0</padding>
<expand>False</expand>
@ -711,7 +704,7 @@
<widget>
<class>GtkOptionMenu</class>
<name>background_select</name>
<name>backend_select</name>
<can_focus>True</can_focus>
<items></items>
<initial_choice>0</initial_choice>
@ -748,7 +741,6 @@
<name>view_logs_button</name>
<can_focus>True</can_focus>
<label>View Logs...</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>0</padding>
<expand>True</expand>
@ -761,7 +753,6 @@
<name>advanced_button</name>
<can_focus>True</can_focus>
<label>Advanced...</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>0</padding>
<expand>True</expand>