diff options
author | Jody Goldberg <jody@src.gnome.org> | 2004-06-25 20:53:58 +0000 |
---|---|---|
committer | Jody Goldberg <jody@src.gnome.org> | 2004-06-25 20:53:58 +0000 |
commit | 9c026ec83c5824ad942673cad6757c7b1a2b9682 (patch) | |
tree | 662bde7a64d0c465874afa83726d91fddae853d4 | |
parent | da6f208ebb2261d5a7635b86d05b8a64491def09 (diff) | |
download | gnome-control-center-9c026ec83c5824ad942673cad6757c7b1a2b9682.tar.gz |
update
-rw-r--r-- | control-center/GNOME_ControlCenter.server.in | 99 | ||||
-rw-r--r-- | control-center/control-center.c | 6 |
2 files changed, 53 insertions, 52 deletions
diff --git a/control-center/GNOME_ControlCenter.server.in b/control-center/GNOME_ControlCenter.server.in index e437e9fb9..a2155ce97 100644 --- a/control-center/GNOME_ControlCenter.server.in +++ b/control-center/GNOME_ControlCenter.server.in @@ -1,51 +1,48 @@ -*************** -*** 0 **** ---- 1,48 ---- -+ <oaf_info> -+ -+ <oaf_server iid="OAFIID:GNOME_ControlCenter_Factory" -+ type="exe" -+ location="gnome-control-center"> -+ <oaf_attribute name="repo_ids" type="stringv"> -+ <item value="IDL:GNOME/ObjectFactory:1.0"/> -+ </oaf_attribute> -+ <oaf_attribute name="name" -+ type="string" -+ _value="Control Center view factory"/> -+ <oaf_attribute name="description" -+ type="string" -+ _value="Control Center view component's factory"/> -+ </oaf_server> -+ -+ <oaf_server iid="OAFIID:GNOME_ControlCenter_View" -+ type="factory" -+ location="OAFIID:GNOME_ControlCenter_Factory"> -+ <oaf_attribute name="test_only" type="boolean" value="false"/> -+ <oaf_attribute name="repo_ids" type="stringv"> -+ <item value="IDL:Bonobo/Unknown:1.0"/> -+ <item value="IDL:Bonobo/Control:1.0"/> -+ <item value="IDL:Nautilus/View:1.0"/> -+ </oaf_attribute> -+ <oaf_attribute name="name" type="string" _value="Control Center view"/> -+ <oaf_attribute name="description" -+ type="string" -+ _value="Control Center view component"/> -+ <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -+ <item value="preferences"/> -+ <item value="preferences-all-users"/> -+ </oaf_attribute> -+ <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -+ <item value="x-directory/*"/> -+ </oaf_attribute> -+ <oaf_attribute name="nautilus:view_as_name" -+ type="string" -+ _value="Control Center"/> -+ <oaf_attribute name="nautilus:view_as_label" -+ type="string" -+ _value="View as Control Center"/> -+ <oaf_attribute name="nautilus:viewer_label" -+ type="string" -+ _value="Control Center Viewer"/> -+ </oaf_server> -+ -+ </oaf_info> +<oaf_info> + +<oaf_server iid="OAFIID:GNOME_ControlCenter_Factory" + type="exe" + location="gnome-control-center"> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" + type="string" + _value="Control Center view factory"/> + <oaf_attribute name="description" + type="string" + _value="Control Center view component's factory"/> +</oaf_server> + +<oaf_server iid="OAFIID:GNOME_ControlCenter_View" + type="factory" + location="OAFIID:GNOME_ControlCenter_Factory"> + <oaf_attribute name="test_only" type="boolean" value="false"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:Bonobo/Unknown:1.0"/> + <item value="IDL:Bonobo/Control:1.0"/> + <item value="IDL:Nautilus/View:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Control Center view"/> + <oaf_attribute name="description" + type="string" + _value="Control Center view component"/> + <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> + <item value="preferences"/> + <item value="preferences-all-users"/> + </oaf_attribute> + <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> + <item value="x-directory/*"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" + type="string" + _value="Control Center"/> + <oaf_attribute name="nautilus:view_as_label" + type="string" + _value="View as Control Center"/> + <oaf_attribute name="nautilus:viewer_label" + type="string" + _value="Control Center Viewer"/> +</oaf_server> + +</oaf_info> diff --git a/control-center/control-center.c b/control-center/control-center.c index 5e5b7c9c0..283395bdc 100644 --- a/control-center/control-center.c +++ b/control-center/control-center.c @@ -578,9 +578,10 @@ set_x (ControlCenter *cc) static void select_entry (ControlCenter *cc, ControlCenterEntry *entry) { - EntryInfo *ei = entry->user_data; + EntryInfo *ei = NULL; GtkAdjustment *pos; double affine[6]; + if (cc->selected == entry) return; @@ -594,6 +595,9 @@ select_entry (ControlCenter *cc, ControlCenterEntry *entry) ((EntryInfo *)cc->selected->user_data)->selected = TRUE; setup_entry (cc->selected); + if (entry == NULL) + return; + ei = entry->user_data; gnome_canvas_item_i2c_affine (GNOME_CANVAS_ITEM (ei->group), affine); pos = gtk_layout_get_vadjustment (GTK_LAYOUT (ei->cover->canvas)); |