dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

corrected 2 annoyances: that stupid hash table == NULL warning and the 

* app/gdisplay.c: corrected 2 annoyances: that stupid hash table == NULL
warning and the pointer in the title bar instead of the ID

* app/internal_procs.c: we're registering more procs, so make update the total
proc count

-Yosh
This commit is contained in:
Manish Singh 1998-08-10 21:56:50 +00:00
parent 7422ae2e03
commit 79f4910c9f
5 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Mon Aug 10 14:48:20 PDT 1998 Manish Singh <yosh@gimp.org>
* app/gdisplay.c: corrected 2 annoyances: that stupid hash table
== NULL warning and the pointer in the title bar instead of the
ID
* app/internal_procs.c: we're registering more procs, so make update
the total proc count
Mon Aug 10 16:20:33 MEST 1998 Sven Neumann <sven@gimp.org> Mon Aug 10 16:20:33 MEST 1998 Sven Neumann <sven@gimp.org>
* app/internal_procs.c * app/internal_procs.c

10
app/core/gimpprojection.c
View File

@ -178,9 +178,9 @@ gdisplay_format_title (GimpImage *gimage,
image_type_str = NULL; image_type_str = NULL;
} }
g_snprintf (title, MAX_TITLE_BUF, "%s" "-%p" ".%d (%s)", g_snprintf (title, MAX_TITLE_BUF, "%s-%d.%d (%s)",
prune_filename (gimage_filename (gimage)), prune_filename (gimage_filename (gimage)),
gimage, pdb_image_to_id (gimage),
gimage->instance_count, gimage->instance_count,
image_type_str); image_type_str);
} }
@ -1197,7 +1197,7 @@ gdisplay_active ()
GtkWidget *event_widget; GtkWidget *event_widget;
GtkWidget *toplevel_widget; GtkWidget *toplevel_widget;
GdkEvent *event; GdkEvent *event;
GDisplay *gdisp; GDisplay *gdisp = NULL;
/* If the popup shell is valid, then get the gdisplay associated with that shell */ /* If the popup shell is valid, then get the gdisplay associated with that shell */
event = gtk_get_current_event (); event = gtk_get_current_event ();
@ -1208,7 +1208,9 @@ gdisplay_active ()
return NULL; return NULL;
toplevel_widget = gtk_widget_get_toplevel (event_widget); toplevel_widget = gtk_widget_get_toplevel (event_widget);
gdisp = g_hash_table_lookup (display_ht, toplevel_widget);
if (display_ht)
gdisp = g_hash_table_lookup (display_ht, toplevel_widget);
if (gdisp) if (gdisp)
return gdisp; return gdisp;

10
app/display/gimpdisplay.c
View File

@ -178,9 +178,9 @@ gdisplay_format_title (GimpImage *gimage,
image_type_str = NULL; image_type_str = NULL;
} }
g_snprintf (title, MAX_TITLE_BUF, "%s" "-%p" ".%d (%s)", g_snprintf (title, MAX_TITLE_BUF, "%s-%d.%d (%s)",
prune_filename (gimage_filename (gimage)), prune_filename (gimage_filename (gimage)),
gimage, pdb_image_to_id (gimage),
gimage->instance_count, gimage->instance_count,
image_type_str); image_type_str);
} }
@ -1197,7 +1197,7 @@ gdisplay_active ()
GtkWidget *event_widget; GtkWidget *event_widget;
GtkWidget *toplevel_widget; GtkWidget *toplevel_widget;
GdkEvent *event; GdkEvent *event;
GDisplay *gdisp; GDisplay *gdisp = NULL;
/* If the popup shell is valid, then get the gdisplay associated with that shell */ /* If the popup shell is valid, then get the gdisplay associated with that shell */
event = gtk_get_current_event (); event = gtk_get_current_event ();
@ -1208,7 +1208,9 @@ gdisplay_active ()
return NULL; return NULL;
toplevel_widget = gtk_widget_get_toplevel (event_widget); toplevel_widget = gtk_widget_get_toplevel (event_widget);
gdisp = g_hash_table_lookup (display_ht, toplevel_widget);
if (display_ht)
gdisp = g_hash_table_lookup (display_ht, toplevel_widget);
if (gdisp) if (gdisp)
return gdisp; return gdisp;

10
app/gdisplay.c
View File

@ -178,9 +178,9 @@ gdisplay_format_title (GimpImage *gimage,
image_type_str = NULL; image_type_str = NULL;
} }
g_snprintf (title, MAX_TITLE_BUF, "%s" "-%p" ".%d (%s)", g_snprintf (title, MAX_TITLE_BUF, "%s-%d.%d (%s)",
prune_filename (gimage_filename (gimage)), prune_filename (gimage_filename (gimage)),
gimage, pdb_image_to_id (gimage),
gimage->instance_count, gimage->instance_count,
image_type_str); image_type_str);
} }
@ -1197,7 +1197,7 @@ gdisplay_active ()
GtkWidget *event_widget; GtkWidget *event_widget;
GtkWidget *toplevel_widget; GtkWidget *toplevel_widget;
GdkEvent *event; GdkEvent *event;
GDisplay *gdisp; GDisplay *gdisp = NULL;
/* If the popup shell is valid, then get the gdisplay associated with that shell */ /* If the popup shell is valid, then get the gdisplay associated with that shell */
event = gtk_get_current_event (); event = gtk_get_current_event ();
@ -1208,7 +1208,9 @@ gdisplay_active ()
return NULL; return NULL;
toplevel_widget = gtk_widget_get_toplevel (event_widget); toplevel_widget = gtk_widget_get_toplevel (event_widget);
gdisp = g_hash_table_lookup (display_ht, toplevel_widget);
if (display_ht)
gdisp = g_hash_table_lookup (display_ht, toplevel_widget);
if (gdisp) if (gdisp)
return gdisp; return gdisp;

2
app/internal_procs.c
View File

@ -77,7 +77,7 @@ internal_procs_init ()
{ {
gfloat pcount = 0; gfloat pcount = 0;
/* grep -c procedural_db_register internal_procs.c */ /* grep -c procedural_db_register internal_procs.c */
gfloat total_pcount = 204; gfloat total_pcount = 206;
app_init_update_status("Internal Procedures", "Tool procedures", app_init_update_status("Internal Procedures", "Tool procedures",
pcount/total_pcount); pcount/total_pcount);