Allow NULL for widget path or class path as documented. (#83150, Sergey

Wed Jun 12 15:08:37 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkrc.c (gtk_rc_get_style_by_paths): Allow
        NULL for widget path or class path as documented.
        (#83150, Sergey Kuzminov)

7 files changed, 40 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 128d503b0..762fddd7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun 12 15:08:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkrc.c (gtk_rc_get_style_by_paths): Allow 
+	NULL for widget path or class path as documented.
+	(#83150, Sergey Kuzminov)
+
 Wed Jun 12 15:02:30 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextutil.c: Fix ZWJ => ZWN typo.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 128d503b0..762fddd7b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Jun 12 15:08:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkrc.c (gtk_rc_get_style_by_paths): Allow 
+	NULL for widget path or class path as documented.
+	(#83150, Sergey Kuzminov)
+
 Wed Jun 12 15:02:30 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextutil.c: Fix ZWJ => ZWN typo.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 128d503b0..762fddd7b 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed Jun 12 15:08:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkrc.c (gtk_rc_get_style_by_paths): Allow 
+	NULL for widget path or class path as documented.
+	(#83150, Sergey Kuzminov)
+
 Wed Jun 12 15:02:30 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextutil.c: Fix ZWJ => ZWN typo.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 128d503b0..762fddd7b 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Jun 12 15:08:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkrc.c (gtk_rc_get_style_by_paths): Allow 
+	NULL for widget path or class path as documented.
+	(#83150, Sergey Kuzminov)
+
 Wed Jun 12 15:02:30 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextutil.c: Fix ZWJ => ZWN typo.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 128d503b0..762fddd7b 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Jun 12 15:08:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkrc.c (gtk_rc_get_style_by_paths): Allow 
+	NULL for widget path or class path as documented.
+	(#83150, Sergey Kuzminov)
+
 Wed Jun 12 15:02:30 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextutil.c: Fix ZWJ => ZWN typo.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 128d503b0..762fddd7b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Jun 12 15:08:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkrc.c (gtk_rc_get_style_by_paths): Allow 
+	NULL for widget path or class path as documented.
+	(#83150, Sergey Kuzminov)
+
 Wed Jun 12 15:02:30 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextutil.c: Fix ZWJ => ZWN typo.
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index a8b424b0c..5c634b687 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -1614,7 +1614,9 @@ gtk_rc_get_style (GtkWidget *widget)
  * gtk_rc_get_style_by_paths:
  * @settings: a #GtkSettings object
  * @widget_path: the widget path to use when looking up the style, or %NULL
+ *               if no matching against the widget path should be done
  * @class_path: the class path to use when looking up the style, or %NULL
+ *               if no matching against the class path should be done.
  * @type: a type that will be used along with parent types of this type
  *        when matching against class styles, or #G_TYPE_NONE
  * 
@@ -1655,7 +1657,7 @@ gtk_rc_get_style_by_paths (GtkSettings *settings,
 
   context = gtk_rc_context_get (settings);
 
-  if (context->rc_sets_widget)
+  if (widget_path && context->rc_sets_widget)
     {
       gchar *path_reversed;
       guint path_length;
@@ -1668,7 +1670,7 @@ gtk_rc_get_style_by_paths (GtkSettings *settings,
       g_free (path_reversed);
     }
   
-  if (context->rc_sets_widget_class)
+  if (class_path && context->rc_sets_widget_class)
     {
       gchar *path_reversed;
       guint path_length;